diff --git a/.github/workflows/deploy-user-docker.yml b/.github/workflows/deploy-user-docker.yml
index 3d8e442e..9a68b401 100644
--- a/.github/workflows/deploy-user-docker.yml
+++ b/.github/workflows/deploy-user-docker.yml
@@ -55,8 +55,10 @@ jobs:
 
       - name: Build and Push Docker Image
         run: |
-          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:user ./nowait-app-user-api
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:user
+          TAG=${GITHUB_SHA::7}
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:${TAG} -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:latest ./nowait-app-user-api
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:${TAG}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:latest
 
   deploy:
     name: Deploy to EC2
diff --git a/docker-compose.user.yml b/docker-compose.user.yml
index dbcd1360..3c08e4a4 100644
--- a/docker-compose.user.yml
+++ b/docker-compose.user.yml
@@ -13,14 +13,14 @@ services:
       - mysql_data:/var/lib/mysql
 
   nowait-app-user-api:
-    image: jihuneddie/nowait_dev:user
+    image: jihuneddie/nowait_dev:latest
     container_name: nowait-app-user-api
     ports:
       - "8081:8081"
     depends_on:
       - mysql
-#    volumes:
-#      - ./nowait-app-user-api:/app
+    volumes:
+      - ./nowait-app-user-api:/app
     restart: always
 
 volumes: