diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml
index 916204cd..b4fa498f 100644
--- a/.github/workflows/deploy-admin-docker.yml
+++ b/.github/workflows/deploy-admin-docker.yml
@@ -56,8 +56,10 @@ jobs:
 
       - name: Build and Push Docker Image
         run: |
-          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:admin ./nowait-app-admin-api
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:admin
+          TAG=${GITHUB_SHA::7}
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:${TAG} -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:latest ./nowait-app-admin-api
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:${TAG}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:latest
 
 
 
diff --git a/docker-compose.admin.yml b/docker-compose.admin.yml
index d42dcaf6..ac0be6a7 100644
--- a/docker-compose.admin.yml
+++ b/docker-compose.admin.yml
@@ -13,7 +13,7 @@ services:
       - mysql_data:/var/lib/mysql
 
   nowait-app-admin-api:
-    image: jihuneddie/nowait_dev:admin
+    image: jihuneddie/nowait_dev:latest
     container_name: nowait-app-admin-api
     ports:
       - "8085:8085"
diff --git a/docker-compose.user-monitoring.yml b/docker-compose.user-monitoring.yml
index 549cdead..39b54dd7 100644
--- a/docker-compose.user-monitoring.yml
+++ b/docker-compose.user-monitoring.yml
@@ -1,6 +1,6 @@
 services:
   prometheus-user:
-    image: prom/prometheus
+    image: prom/prometheus:latest
     container_name: prometheus-user
     ports:
       - "9090:9090"
@@ -13,7 +13,7 @@ services:
     restart: always
 
   grafana-user:
-    image: grafana/grafana
+    image: grafana/grafana:latest
     container_name: grafana-user
     ports:
       - "3003:3000"