diff --git a/client/pom.xml b/client/pom.xml
index db670890b..f30a5f270 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -118,7 +118,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.10</version>
+        <version>1.7.35</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
diff --git a/dev-env/aet-swarm-dev.yml b/dev-env/aet-swarm-dev.yml
index 922a97c9b..fc85c6f13 100644
--- a/dev-env/aet-swarm-dev.yml
+++ b/dev-env/aet-swarm-dev.yml
@@ -95,9 +95,9 @@ services:
       - hub
       - activemq
     volumes:
-      - ./bundles:/aet/core/bundles
+      - ./bundles:/aet/custom/bundles
       - ./configs:/aet/custom/configs
-      - ./features:/aet/core/features
+      - ./features:/aet/custom/features
     secrets:
       - KARAF_EXAMPLE_SECRET
     ports:
diff --git a/osgi-dependencies/aet-features.xml b/osgi-dependencies/aet-features.xml
index e6ed37792..3a3419aa7 100644
--- a/osgi-dependencies/aet-features.xml
+++ b/osgi-dependencies/aet-features.xml
@@ -24,7 +24,7 @@
         xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
     <!-- older version of spring required for ActiveMQ -->
-    <repository>mvn:org.apache.karaf.features/spring-legacy/4.2.0/xml/features</repository>
+    <repository>mvn:org.apache.karaf.features/spring-legacy/4.2.15/xml/features</repository>
     <repository>mvn:org.apache.activemq/activemq-karaf/5.15.2/xml/features</repository>
     <repository>mvn:org.apache.cxf.karaf/apache-cxf/3.2.0/xml/features</repository>
 
@@ -59,7 +59,7 @@
         <bundle>mvn:org.apache.commons/commons-text/1.8</bundle>
 
         <!-- required by fileupload -->
-        <bundle>mvn:org.apache.felix/org.apache.felix.http.servlet-api/1.1.2</bundle>
+        <bundle>mvn:org.apache.felix/org.apache.felix.http.servlet-api/1.1.4</bundle>
     </feature>
 
     <feature name="aet-jackson" version="0.6.0" description="Bundles for Jackson" install="auto">
@@ -91,7 +91,7 @@
 
         <bundle>wrap:mvn:cglib/cglib-nodep/2.2.2</bundle>
 
-        <bundle>mvn:org.freemarker/freemarker/2.3.29</bundle>
+        <bundle>mvn:org.freemarker/freemarker/2.3.31</bundle>
 
         <bundle>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.9</bundle>
         <bundle>wrap:mvn:org.hamcrest/hamcrest-core/1.3</bundle>
diff --git a/osgi-dependencies/aet-webconsole.xml b/osgi-dependencies/aet-webconsole.xml
index 1b7e84d56..04672ffe2 100644
--- a/osgi-dependencies/aet-webconsole.xml
+++ b/osgi-dependencies/aet-webconsole.xml
@@ -25,7 +25,7 @@
 
     <feature name="aet-webconsole" version="0.6.0" description="Felix Web Console" install="auto">
         <feature>webconsole</feature>
-        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/4.1.2</bundle>
+        <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/4.2.15</bundle>
     </feature>
 
 </features>
diff --git a/pom.xml b/pom.xml
index f099da05d..2bd5c80c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,10 +225,9 @@
       </dependency>
       <!-- provided by Karaf: javax.servlet 3.5 -->
       <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        <version>1.2</version>
-        <scope>provided</scope>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.1.0</version>
       </dependency>
       <!-- provided in Karaf by pax-logging -->
       <dependency>
@@ -331,7 +330,7 @@
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.servlet-api</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.4</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -493,7 +492,7 @@
       <dependency>
         <groupId>org.freemarker</groupId>
         <artifactId>freemarker</artifactId>
-        <version>2.3.29</version>
+        <version>2.3.31</version>
         <scope>provided</scope>
       </dependency>
 
diff --git a/rest-endpoint/pom.xml b/rest-endpoint/pom.xml
index 9fd448c4c..b0bf3f855 100644
--- a/rest-endpoint/pom.xml
+++ b/rest-endpoint/pom.xml
@@ -72,8 +72,8 @@
       <artifactId>validation-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/test-executor/pom.xml b/test-executor/pom.xml
index f049277e7..0fedc5297 100644
--- a/test-executor/pom.xml
+++ b/test-executor/pom.xml
@@ -76,8 +76,8 @@
       <artifactId>validation-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>