diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 2c37abc2..a14359db 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -38,7 +38,38 @@ jobs:
         with:
           context: .
           push: true
-          tags: ghcr.io/fuellabs/fuel-bridge:${{ github.event.pull_request.base.sha }}
+          tags: ghcr.io/fuellabs/fuel-bridge:latest
+          file: docker/l1-chain/Dockerfile
+          platforms: linux/amd64,linux/arm64
+  build-fuel-bridge-hashed:
+    name: Build and Push fuel-bridge Image hashed tag
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get short SHA
+        id: short_sha
+        run: echo "::set-output name=SHORT_SHA::${GITHUB_SHA::7}"
+
+      - name: Build and push multi-arch fuel-bridge image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/fuellabs/fuel-bridge:${{ steps.short_sha.outputs.SHORT_SHA }}
           file: docker/l1-chain/Dockerfile
           platforms: linux/amd64,linux/arm64
 
@@ -66,6 +97,39 @@ jobs:
         with:
           context: .
           push: true
-          tags: ghcr.io/fuellabs/fuel-bridge-full:${{ github.event.pull_request.base.sha }}
+          tags: ghcr.io/fuellabs/fuel-bridge-full:latest
+          file: docker/full-env/Dockerfile
+          platforms: linux/amd64,linux/arm64
+    
+  build-fuel-bridge-full-hashed:
+    name: Build and Push fuel-bridge-full Image hashed tag
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get short SHA
+        id: short_sha
+        run: echo "::set-output name=SHORT_SHA::${GITHUB_SHA::7}"
+
+      - name: Build and push multi-arch fuel-bridge-full image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/fuellabs/fuel-bridge:${{ steps.short_sha.outputs.SHORT_SHA }}
           file: docker/full-env/Dockerfile
           platforms: linux/amd64,linux/arm64
+