diff --git a/artemis-hawtio/activemq-branding/pom.xml b/artemis-hawtio/activemq-branding/pom.xml
index 242e646376..b20f6349ac 100644
--- a/artemis-hawtio/activemq-branding/pom.xml
+++ b/artemis-hawtio/activemq-branding/pom.xml
@@ -76,8 +76,8 @@
 
         <!-- servlet API is provided by the container -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/artemis-hawtio/artemis-console/pom.xml b/artemis-hawtio/artemis-console/pom.xml
index 184a283388..be94d36c31 100644
--- a/artemis-hawtio/artemis-console/pom.xml
+++ b/artemis-hawtio/artemis-console/pom.xml
@@ -37,9 +37,8 @@
   
   <dependencies>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>${servlet-api-version}</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/artemis-hawtio/artemis-plugin/pom.xml b/artemis-hawtio/artemis-plugin/pom.xml
index 919246e592..cdb7ce4256 100644
--- a/artemis-hawtio/artemis-plugin/pom.xml
+++ b/artemis-hawtio/artemis-plugin/pom.xml
@@ -80,8 +80,8 @@
 
     <!-- servlet API is provided by the container -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/artemis-hawtio/pom.xml b/artemis-hawtio/pom.xml
index ee53280f42..3e6396b2f8 100644
--- a/artemis-hawtio/pom.xml
+++ b/artemis-hawtio/pom.xml
@@ -45,7 +45,7 @@
         <maven-plugin-version>3.3</maven-plugin-version>
         <maven-source-plugin-version>2.1.2</maven-source-plugin-version>
         <maven-resources-plugin-version>2.6</maven-resources-plugin-version>
-        <servlet-api-version>2.5</servlet-api-version>
+        <geronimo.servlet.3.0.spec.version>1.0</geronimo.servlet.3.0.spec.version>
 
         <!-- use slf4j-api 1.6.x to be easy compatible with older Karaf/Camel releases -->
         <slf4j-api-version>1.6.6</slf4j-api-version>
@@ -67,9 +67,9 @@
 
             <!-- servlet API is provided by the container -->
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>${servlet-api-version}</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_3.0_spec</artifactId>
+                <version>${geronimo.servlet.3.0.spec.version}</version>
                 <scope>provided</scope>
             </dependency>
 
diff --git a/examples/features/sub-modules/tomcat/pom.xml b/examples/features/sub-modules/tomcat/pom.xml
index 9ceab2dff1..f024395365 100644
--- a/examples/features/sub-modules/tomcat/pom.xml
+++ b/examples/features/sub-modules/tomcat/pom.xml
@@ -36,7 +36,7 @@ under the License.
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <projectBaseUri>${project.baseUri}</projectBaseUri>
 
-        <servlet-api.version>3.0-alpha-1</servlet-api.version>
+        <geronimo.servlet.3.0.spec.version>1.0</geronimo.servlet.3.0.spec.version>
     </properties>
 
     <dependencies>
@@ -66,9 +66,9 @@ under the License.
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet-api.version}</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <version>${geronimo.servlet.3.0.spec.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 84be08125b..c48f8ab20e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
       <fuse.mqtt.client.version>1.16</fuse.mqtt.client.version>
       <guava.version>30.1-jre</guava.version>
       <jboss.logging.version>3.4.0.Final</jboss.logging.version>
-      <jetty.version>9.4.35.v20201120</jetty.version>
+      <jetty.version>9.4.38.v20210224</jetty.version>
       <jgroups.version>3.6.13.Final</jgroups.version>
       <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
       <mockito.version>3.3.3</mockito.version>