diff --git a/base/tps/shared/webapps/tps/WEB-INF/web.xml b/base/tps/shared/webapps/tps/WEB-INF/web.xml
index 98bce3c3a95..3cc296edd46 100644
--- a/base/tps/shared/webapps/tps/WEB-INF/web.xml
+++ b/base/tps/shared/webapps/tps/WEB-INF/web.xml
@@ -7,16 +7,6 @@
 
     <display-name>Token Processing Service</display-name>
 
-    <servlet>
-        <servlet-name>tps</servlet-name>
-        <servlet-class>org.dogtagpki.server.tps.TPSServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>tps</servlet-name>
-        <url-pattern>/tps</url-pattern>
-    </servlet-mapping>
-
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Account Services</web-resource-name>
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSServlet.java b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSServlet.java
index b11c6a3caad..2b0c7dcdc81 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSServlet.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSServlet.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -28,6 +29,10 @@
 /**
  * @author Endi S. Dewata <edewata@redhat.com>
  */
+@WebServlet(
+        name = "tps",
+        urlPatterns = "/tps"
+)
 public class TPSServlet extends HttpServlet {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TPSServlet.class);