diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 00000000..81183802
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,45 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Set short commit SHA
+        id: vars
+        run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
+        
+      - name: Log in to GitHub Container Registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Build the Docker image
+        run: |
+          cd src/
+          docker build . --file Dockerfile \
+            --tag ghcr.io/${{ github.repository_owner }}/bedrock-access-gateway:${{ env.SHORT_SHA }} \
+            --tag ghcr.io/${{ github.repository_owner }}/bedrock-access-gateway:latest \
+            
+
+      - name: Push the Docker image to GitHub Container Registry
+        run: |
+          docker push ghcr.io/${{ github.repository_owner }}/bedrock-access-gateway:${{ env.SHORT_SHA }}
+          docker push ghcr.io/${{ github.repository_owner }}/bedrock-access-gateway:latest
+
+      - name: Build the Docker_ecs image
+        run: |
+          cd src/
+          docker build . --file Dockerfile_ecs \
+            --tag ghcr.io/${{ github.repository_owner }}/bedrock-access-gateway:${{ env.SHORT_SHA }}-ecs \
+            --tag ghcr.io/${{ github.repository_owner }}/bedrock-access-gateway:latest-ecs \
+
+      - name: Push the Docker_ecs image to GitHub Container Registry
+        run: |
+          docker push ghcr.io/${{ github.repository_owner }}/bedrock-access-gateway:${{ env.SHORT_SHA }}-ecs
+          docker push ghcr.io/${{ github.repository_owner }}/bedrock-access-gateway:latest-ecs