diff --git a/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml
index 493f1a72de6..a67d7ce7071 100644
--- a/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -94,25 +94,6 @@
                          <param-value> certUserDBAuthMgr </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  kraKRASrchKey  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.key.SrchKey  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> true        </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> kra         </param-value> </init-param>
-             <init-param><param-name>  templatePath   </param-name>
-                         <param-value> /agent/kra/srchKey.template</param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraKRASrchKey </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> certUserDBAuthMgr </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.kra.keys </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  kraGrantRecovery  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.base.DisplayHtmlServlet  </servlet-class>
@@ -134,44 +115,6 @@
                          <param-value> certUserDBAuthMgr </param-value> </init-param>
    </servlet>
 
-   <servlet>
-      <servlet-name>  kraKRASrchKeyForRecovery  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.key.SrchKeyForRecovery  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> true        </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> kra         </param-value> </init-param>
-             <init-param><param-name>  templatePath   </param-name>
-                         <param-value> /agent/kra/srchKeyForRecovery.template</param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraKRASrchKeyForRecovery </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> certUserDBAuthMgr </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.kra.keys </param-value> </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>  kraKRADisplayBySerial  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.key.DisplayBySerial  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> true        </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> kra         </param-value> </init-param>
-             <init-param><param-name>  templatePath   </param-name>
-                         <param-value> /agent/kra/displayBySerial.template</param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraKRADisplayBySerial </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> certUserDBAuthMgr </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.kra.key </param-value> </init-param>
-   </servlet>
-
 <!--
    <servlet>
       <servlet-name>  krajobsScheduler  </servlet-name>
@@ -183,115 +126,6 @@
    </servlet>
 -->
 
-   <servlet>
-      <servlet-name>  kralog  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.admin.KRALogAdminServlet  </servlet-class>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kralog      </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>  services </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.KRAMainPageServlet </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  authorityId  </param-name>
-                         <param-value> kra          </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> services </param-value> </init-param>
-             <init-param><param-name>  templatePath  </param-name>
-                         <param-value> /services.template </param-value> </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>  kraUpdateNumberRange  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.KRAUpdateNumberRange  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> kra          </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraUpdateNumberRange </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> admin       </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> TokenAuth </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.clone.configuration.UpdateNumberRange </param-value> </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>  kraDownloadPKCS12  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.KRADownloadPKCS12  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> kra          </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraDownloadPKCS12 </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> ee          </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> TokenAuth </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.clone.configuration </param-value> </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>  kraGetStatus  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.KRAGetStatus  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> kra          </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraGetStatus </param-value> </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>  kraUpdateDomainXML  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.KRAUpdateDomainXML  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> true       </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> kra         </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraUpdateDomainXML </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> agent          </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> certUserDBAuthMgr </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.securitydomain.domainxml </param-value> </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>  kraUpdateDomainXML-admin  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.KRAAdminUpdateDomainXML  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> kra         </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraUpdateDomainXML </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> admin          </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> TokenAuth </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.securitydomain.domainxml </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  kraGetCookie  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.csadmin.GetCookie  </servlet-class>
@@ -337,11 +171,6 @@
                          <param-value> admin          </param-value> </init-param>
    </servlet>
 
-   <servlet-mapping>
-      <servlet-name>  kralog  </servlet-name>
-      <url-pattern>   /log  </url-pattern>
-   </servlet-mapping>
-
 <!--
    <servlet-mapping>
       <servlet-name>  krajobsScheduler  </servlet-name>
@@ -374,56 +203,11 @@
       <url-pattern>   /index  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  kraKRASrchKey  </servlet-name>
-      <url-pattern>   /agent/kra/srchKey  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  kraGrantRecovery  </servlet-name>
       <url-pattern>   /agent/kra/grantRecovery.html  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  kraKRASrchKeyForRecovery  </servlet-name>
-      <url-pattern>   /agent/kra/srchKeyForRecovery  </url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>  kraKRADisplayBySerial  </servlet-name>
-      <url-pattern>   /agent/kra/displayBySerial  </url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>  services </servlet-name>
-      <url-pattern>   /services  </url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>  kraUpdateNumberRange </servlet-name>
-      <url-pattern>   /admin/kra/updateNumberRange  </url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>  kraDownloadPKCS12 </servlet-name>
-      <url-pattern>   /admin/console/config/savepkcs12 </url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>  kraGetStatus  </servlet-name>
-      <url-pattern>   /admin/kra/getStatus  </url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>  kraUpdateDomainXML </servlet-name>
-      <url-pattern>   /agent/kra/updateDomainXML  </url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>  kraUpdateDomainXML-admin </servlet-name>
-      <url-pattern>   /admin/kra/updateDomainXML  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  kraGetCookie </servlet-name>
       <url-pattern>   /admin/kra/getCookie  </url-pattern>
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRALogAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRALogAdminServlet.java
index 8d79b57c5df..3bbe252e266 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRALogAdminServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRALogAdminServlet.java
@@ -17,6 +17,17 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.admin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "kralog",
+        urlPatterns = "/log",
+        initParams = {
+                @WebInitParam(name="ID",       value="kralog"),
+                @WebInitParam(name="AuthzMgr", value="BasicAclAuthz")
+        }
+)
 public class KRALogAdminServlet extends LogAdminServlet {
     private static final long serialVersionUID = 1L;
 }
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java
index 006915ecec0..7fef2872971 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java
@@ -17,6 +17,22 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "kraUpdateDomainXML-admin",
+        urlPatterns = "/admin/kra/updateDomainXML",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="authority",     value="kra"),
+                @WebInitParam(name="ID",            value="kraUpdateDomainXML"),
+                @WebInitParam(name="interface",     value="admin"),
+                @WebInitParam(name="AuthMgr",       value="TokenAuth"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="resourceID",    value="certServer.securitydomain.domainxml")
+        }
+)
 public class KRAAdminUpdateDomainXML extends UpdateDomainXML {
     private static final long serialVersionUID = 1L;
 }
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRADownloadPKCS12.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRADownloadPKCS12.java
index c85904afddf..7308890fa71 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRADownloadPKCS12.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRADownloadPKCS12.java
@@ -17,6 +17,22 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "kraDownloadPKCS12",
+        urlPatterns = "/admin/console/config/savepkcs12",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="authority",     value="kra"),
+                @WebInitParam(name="ID",            value="kraDownloadPKCS12"),
+                @WebInitParam(name="interface",     value="ee"),
+                @WebInitParam(name="AuthMgr",       value="TokenAuth"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="resourceID",    value="certServer.clone.configuration")
+        }
+)
 public class KRADownloadPKCS12 extends DownloadPKCS12 {
     private static final long serialVersionUID = 1L;
 }
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetStatus.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetStatus.java
index e6c5e51e207..71f7330d078 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetStatus.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAGetStatus.java
@@ -17,6 +17,18 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "kraGetStatus",
+        urlPatterns = "/admin/kra/getStatus",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="authority",     value="kra"),
+                @WebInitParam(name="ID",            value="kraGetStatus")
+        }
+)
 public class KRAGetStatus extends GetStatus {
     private static final long serialVersionUID = 1L;
 }
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAMainPageServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAMainPageServlet.java
index 5f00f784499..f42805560db 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAMainPageServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAMainPageServlet.java
@@ -17,6 +17,19 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "services",
+        urlPatterns = "/services",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="authorityId",   value="kra"),
+                @WebInitParam(name="ID",            value="services"),
+                @WebInitParam(name="templatePath",  value="/services.template")
+        }
+)
 public class KRAMainPageServlet extends MainPageServlet {
     private static final long serialVersionUID = 1L;
 }
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateDomainXML.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateDomainXML.java
index aa035beaaea..1a8b0be7eab 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateDomainXML.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateDomainXML.java
@@ -17,6 +17,22 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "kraUpdateDomainXML",
+        urlPatterns = "/agent/kra/updateDomainXML",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="true"),
+                @WebInitParam(name="authority",     value="kra"),
+                @WebInitParam(name="ID",            value="kraUpdateDomainXML"),
+                @WebInitParam(name="interface",     value="agent"),
+                @WebInitParam(name="AuthMgr",       value="certUserDBAuthMgr"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="resourceID",    value="certServer.securitydomain.domainxml")
+        }
+)
 public class KRAUpdateDomainXML extends UpdateDomainXML {
     private static final long serialVersionUID = 1L;
 }
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java
index 09baf70d91c..659e6beeb4d 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAUpdateNumberRange.java
@@ -17,14 +17,32 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
 import org.dogtagpki.server.kra.KRAEngine;
 
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.cmscore.dbs.Repository;
 import com.netscape.kra.KeyRecoveryAuthority;
 
+@WebServlet(
+        name = "kraUpdateNumberRange",
+        urlPatterns = "/admin/kra/updateNumberRange",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="authority",     value="kra"),
+                @WebInitParam(name="ID",            value="kraUpdateNumberRange"),
+                @WebInitParam(name="interface",     value="admin"),
+                @WebInitParam(name="AuthMgr",       value="TokenAuth"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="resourceID",    value="certServer.clone.configuration.UpdateNumberRange")
+        }
+)
 public class KRAUpdateNumberRange extends UpdateNumberRange {
 
+    private static final long serialVersionUID = 1L;
+
     @Override
     public Repository getRepository(String type) throws EBaseException {
 
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerial.java
index d7d12ca94f6..be70eb402d6 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerial.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/DisplayBySerial.java
@@ -24,6 +24,8 @@
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -47,15 +49,22 @@
 
 /**
  * Display a specific Key Archival Request
- * <P>
- *
- * @version $Revision$, $Date$
  */
+@WebServlet(
+        name = "kraKRADisplayBySerial",
+        urlPatterns = "/agent/kra/displayBySerial",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="true"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="authority",     value="kra"),
+                @WebInitParam(name="templatePath",  value="/agent/kra/displayBySerial.template"),
+                @WebInitParam(name="ID",            value="kraKRADisplayBySerial"),
+                @WebInitParam(name="AuthMgr",       value="certUserDBAuthMgr"),
+                @WebInitParam(name="resourceID",    value="certServer.kra.key")
+        }
+)
 public class DisplayBySerial extends CMSServlet {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = -537957487396615246L;
     private final static String INFO = "displayBySerial";
     private final static String TPL_FILE = "displayBySerial.template";
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKey.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKey.java
index 47faeaed103..ddbb7a67e95 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKey.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKey.java
@@ -24,6 +24,8 @@
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -49,9 +51,20 @@
 
 /**
  * Retrieve archived keys matching search criteria
- *
- * @version $Revision$, $Date$
  */
+@WebServlet(
+        name = "kraKRASrchKey",
+        urlPatterns = "/agent/kra/srchKey",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="true"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="authority",     value="kra"),
+                @WebInitParam(name="templatePath",  value="/agent/kra/srchKey.template"),
+                @WebInitParam(name="ID",            value="kraKRASrchKey"),
+                @WebInitParam(name="AuthMgr",       value="certUserDBAuthMgr"),
+                @WebInitParam(name="resourceID",    value="certServer.kra.keys")
+        }
+)
 public class SrchKey extends CMSServlet {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SrchKey.class);
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
index 0b5db50437f..3dd7cbc3b54 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
@@ -24,6 +24,8 @@
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -49,10 +51,20 @@
 
 /**
  * Retrieve archived keys matching given public key material
- *
- *
- * @version $Revision$, $Date$
  */
+@WebServlet(
+        name = "kraKRASrchKeyForRecovery",
+        urlPatterns = "/agent/kra/srchKeyForRecovery",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="true"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="authority",     value="kra"),
+                @WebInitParam(name="templatePath",  value="/agent/kra/srchKeyForRecovery.template"),
+                @WebInitParam(name="ID",            value="kraKRASrchKeyForRecovery"),
+                @WebInitParam(name="AuthMgr",       value="certUserDBAuthMgr"),
+                @WebInitParam(name="resourceID",    value="certServer.kra.keys")
+        }
+)
 public class SrchKeyForRecovery extends CMSServlet {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SrchKeyForRecovery.class);