diff --git a/Dockerfile b/Dockerfile
index 73dece2..1ab47f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openlmis/service-base:6.1
+FROM openlmis/service-base:7
 
 COPY build/libs/*.jar /service.jar
 COPY src/main/resources/db/demo-data/*.csv /demo-data/
diff --git a/docker-compose.builder.yml b/docker-compose.builder.yml
index c9ef207..32997bc 100644
--- a/docker-compose.builder.yml
+++ b/docker-compose.builder.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   builder:
-    image: openlmis/dev:9
+    image: openlmis/dev:10
     links:
       - db
       - log
@@ -15,7 +15,7 @@ services:
       JAVA_OPTS: '-Dlogging.config=/logback.xml'
     env_file: .env
   sonar:
-    image: openlmis/dev:9
+    image: openlmis/dev:10
     links:
       - db
       - log
@@ -30,7 +30,7 @@ services:
       GRADLE_OPTS: '-Dorg.gradle.daemon=false'
     env_file: .env
   demo-data:
-    image: openlmis/dev:9
+    image: openlmis/dev:10
     links:
       - db
       - log
@@ -50,6 +50,6 @@ services:
     image: openlmis/postgres:12-debezium
     env_file: .env
   log:
-    image: openlmis/rsyslog:1
+    image: openlmis/rsyslog:3
     volumes:
       - '../logs/cce:/var/log'
diff --git a/docker-compose.erd-generation.yml b/docker-compose.erd-generation.yml
index 7d495be..ac57ed5 100644
--- a/docker-compose.erd-generation.yml
+++ b/docker-compose.erd-generation.yml
@@ -15,6 +15,6 @@ services:
     env_file: .env
 
   log:
-    image: openlmis/rsyslog:1
+    image: openlmis/rsyslog:3
     volumes:
       - '../logs/cce:/var/log'
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index aefcdd2..dd55cab 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -2,7 +2,7 @@ version: "2"
 services:
 
   cce:
-    image: openlmis/dev:9
+    image: openlmis/dev:10
     ports:
       - "5005:5005"
       - "8080:8080"
diff --git a/docker-compose.yml b/docker-compose.yml
index dc7f968..a3b27b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,6 @@ services:
     image: openlmis/postgres:12-debezium
     env_file: .env
   log:
-    image: openlmis/rsyslog:1
+    image: openlmis/rsyslog:3
     volumes:
       - '../logs/cce:/var/log'