diff --git a/backup.docker-compose.yml b/backup.docker-compose.yml
index 2a576d4..f86409e 100644
--- a/backup.docker-compose.yml
+++ b/backup.docker-compose.yml
@@ -12,7 +12,7 @@ services:
   # MySQL backups
   #
   openmrs-db-backup:
-    image: mekomsolutions/mysql_backup:a087235
+    image: mekomsolutions/mysql_backup:latest
     depends_on:
       create-backup-folder:
         condition: service_completed_successfully
@@ -30,7 +30,7 @@ services:
       - "${BACKUP_PATH:-backup-path}:/opt/backup/"
 
   eip-client-backup:
-    image: mekomsolutions/mysql_backup:a087235
+    image: mekomsolutions/mysql_backup:latest
     depends_on:
       create-backup-folder:
         condition: service_completed_successfully
@@ -54,7 +54,7 @@ services:
     depends_on:
       create-backup-folder:
         condition: service_completed_successfully
-    image: mekomsolutions/postgres_backup:a087235
+    image: mekomsolutions/postgres_backup:latest
     environment:
       DB_HOST: odoo-postgresql
       DB_NAME: odoo
@@ -73,7 +73,7 @@ services:
     depends_on:
       create-backup-folder:
         condition: service_completed_successfully
-    image: mekomsolutions/postgres_backup:a087235
+    image: mekomsolutions/postgres_backup:latest
     environment:
       DB_HOST: postgresql
       DB_NAME: ${OPENELIS_DB_NAME}
@@ -95,7 +95,7 @@ services:
     depends_on:
       create-backup-folder:
         condition: service_completed_successfully
-    image: mekomsolutions/filestore_backup:a087235
+    image: mekomsolutions/filestore_backup:latest
     environment:
       FILESTORE_PATH: /mnt/home
       FILENAME: bahmni-home
@@ -108,7 +108,7 @@ services:
     depends_on:
       create-backup-folder:
         condition: service_completed_successfully
-    image: mekomsolutions/filestore_backup:a087235
+    image: mekomsolutions/filestore_backup:latest
     environment:
       FILESTORE_PATH: /mnt/odoo
       BACKUP_PATH: "/opt/backup/${BACKUP_FOLDER}"
@@ -121,7 +121,7 @@ services:
     depends_on:
       create-backup-folder:
         condition: service_completed_successfully
-    image: mekomsolutions/filestore_backup:a087235
+    image: mekomsolutions/filestore_backup:latest
     environment:
       FILESTORE_PATH: /mnt/odoo_config_checksum
       BACKUP_PATH: "/opt/backup/${BACKUP_FOLDER}"
@@ -131,7 +131,7 @@ services:
       - "${ODOO_CONFIG_CHECKSUM_PATH:-odoo-checksums}:/mnt/odoo_config_checksum"
 
   openmrs-checksum-backup:
-    image: mekomsolutions/filestore_backup:a087235
+    image: mekomsolutions/filestore_backup:latest
     depends_on:
       create-backup-folder:
         condition: service_completed_successfully
diff --git a/docker-compose.yml b/docker-compose.yml
index 0072ff5..82157e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   # Apache HTTPD: Entry point for the application.
   proxy:
-    image: mekomsolutions/proxy:4a3d534
+    image: mekomsolutions/proxy:bahmni_latest
     command: "httpd-foreground ${PROXY_TLS}"
     restart: unless-stopped
     healthcheck:
@@ -27,7 +27,7 @@ services:
   # Bahmni Apps: The main front-end component
   # aka 'Bahmni EMR'
   bahmniapps:
-    image: mekomsolutions/bahmniapps:4a3d534
+    image: mekomsolutions/bahmniapps:bahmni_latest
     restart: unless-stopped
     healthcheck:
       test:
@@ -45,7 +45,7 @@ services:
 
   # Implementer Interface: Front-end application to bring Bahmni Forms 2.0
   implementer-interface:
-    image: mekomsolutions/implementer-interface:4a3d534
+    image: mekomsolutions/implementer-interface:bahmni_latest
     restart: unless-stopped
     healthcheck:
       test:
@@ -60,7 +60,7 @@ services:
           - implementer-interface
 
   bahmni-home:
-    image: mekomsolutions/httpd:4a3d534
+    image: mekomsolutions/httpd:bahmni_latest
     restart: unless-stopped
     expose:
       - "8904"
@@ -120,7 +120,7 @@ services:
 
   # OpenMRS:
   openmrs:
-    image: mekomsolutions/openmrs:4a3d534
+    image: mekomsolutions/openmrs:bahmni_latest
     restart: unless-stopped
     depends_on:
       - mysql
@@ -194,7 +194,7 @@ services:
 
   # Bahmni Reports: Standalone Java app to provide Reporting capabilities
   bahmni-reports:
-    image: mekomsolutions/bahmni-reports:4a3d534
+    image: mekomsolutions/bahmni-reports:bahmni_latest
     restart: unless-stopped
     environment:
       # OpenMRS DB connection details
@@ -241,7 +241,7 @@ services:
 
   # Bahmni Mart: Standalone JAVA app to schedule ETL tasks
   bahmni-mart:
-    image: mekomsolutions/bahmni-mart:4a3d534
+    image: mekomsolutions/bahmni-mart:bahmni_latest
     restart: unless-stopped
     environment:
       # OpenMRS DB connection details
@@ -276,7 +276,7 @@ services:
 
   # Metabase: Reporting paltform
   metabase:
-    image: mekomsolutions/metabase:4a3d534
+    image: mekomsolutions/metabase:bahmni_latest
     restart: unless-stopped
     environment:
       MB_DB_TYPE: postgres
@@ -423,7 +423,7 @@ services:
           - eip-client
 
   openelis:
-    image: mekomsolutions/openelis:4a3d534
+    image: mekomsolutions/openelis:bahmni_latest
     restart: unless-stopped
     depends_on:
       - postgresql
diff --git a/pom.xml b/pom.xml
index 38cd25d..74bf464 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>net.mekomsolutions</groupId>
   <artifactId>bahmni-docker-compose</artifactId>
   <name>Bahmni Docker Compose</name>
-  <version>2.7.0</version>
+  <version>2.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <developers>
diff --git a/postgres_restore.yml b/postgres_restore.yml
index 2ea4d4b..fdb0d38 100644
--- a/postgres_restore.yml
+++ b/postgres_restore.yml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   pg_restore:
-    image: mekomsolutions/postgres_backup:a087235
+    image: mekomsolutions/postgres_backup:latest
     entrypoint: "./opt/restore/restore.sh"
     environment:
       POSTGRES_DB: postgres
diff --git a/s3-backup.docker-compose.yml b/s3-backup.docker-compose.yml
index 670f40a..4be6d02 100644
--- a/s3-backup.docker-compose.yml
+++ b/s3-backup.docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   upload-backup:
-    image: mekomsolutions/s3_sync:a087235
+    image: mekomsolutions/s3_sync:latest
     environment:
     - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
     - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}