diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 2af2ee6..44d417a 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -3,7 +3,7 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, develop ]
 env:
   IMAGE_TAG: ${{ github.sha }}
   DOCKER_IMAGE: ${{ vars.DOCKER_IMAGE }}
@@ -22,13 +22,25 @@ jobs:
       name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
-    - name: Login to GCR
+    - 
+      name: Login to GCR
       uses: docker/login-action@v2
       with:
         registry: gcr.io
         username: _json_key
         password: ${{ secrets.GCP_SA_KEY }}
 
+    - 
+      name: Set Image Tag based on branch
+      run: |
+        if [ "${{ github.ref_name }}" == "master" ]; then
+          echo "IMAGE_TAG=${{ github.sha }}" >> $GITHUB_ENV
+          echo "IMAGE_TAG_LATEST=latest" >> $GITHUB_ENV
+        elif [ "${{ github.ref_name }}" == "develop" ]; then
+          echo "IMAGE_TAG=dev_${{ github.sha }}" >> $GITHUB_ENV
+          echo "IMAGE_TAG_LATEST=develop" >> $GITHUB_ENV
+        fi
+
     -
       name: Build and push
       uses: docker/build-push-action@v3
@@ -36,4 +48,4 @@ jobs:
         context: .
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: ${{env.DOCKER_IMAGE}}:${{env.IMAGE_TAG}},${{env.DOCKER_IMAGE}}:latest        
+        tags: ${{env.DOCKER_IMAGE}}:${{env.IMAGE_TAG}},${{env.DOCKER_IMAGE}}:${{ env.IMAGE_TAG_LATEST }}