diff --git a/.github/workflows/agent-build.yaml b/.github/workflows/agent-build.yaml
index ea5dc3c..d208c0b 100644
--- a/.github/workflows/agent-build.yaml
+++ b/.github/workflows/agent-build.yaml
@@ -62,4 +62,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/metalbear-co/ci-agent-runtime:latest
\ No newline at end of file
+            ghcr.io/metalbear-co/ci-agent-runtime:latest
+            ghcr.io/metalbear-co/ci-agent-runtime:${{ github.sha }}
\ No newline at end of file
diff --git a/.github/workflows/docs-build.yaml b/.github/workflows/docs-build.yaml
index 8bf504c..7e08c65 100644
--- a/.github/workflows/docs-build.yaml
+++ b/.github/workflows/docs-build.yaml
@@ -32,4 +32,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/metalbear-co/ci-docs-build:latest
\ No newline at end of file
+            ghcr.io/metalbear-co/ci-docs-build:latest
+            ghcr.io/metalbear-co/ci-docs-build:${{ github.sha }}
\ No newline at end of file
diff --git a/.github/workflows/layer-build.yaml b/.github/workflows/layer-build.yaml
index d4a1bd9..9583498 100644
--- a/.github/workflows/layer-build.yaml
+++ b/.github/workflows/layer-build.yaml
@@ -33,6 +33,7 @@ jobs:
           push: true
           tags: |
             ghcr.io/metalbear-co/ci-layer-build:latest
+            ghcr.io/metalbear-co/ci-layer-build:${{ github.sha }}
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
@@ -41,4 +42,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/metalbear-co/ci-layer-build-aarch64:latest
\ No newline at end of file
+            ghcr.io/metalbear-co/ci-layer-build-aarch64:latest
+            ghcr.io/metalbear-co/ci-layer-build-aarch64:${{ github.sha }}
\ No newline at end of file
diff --git a/.github/workflows/tests-runner-build.yaml b/.github/workflows/tests-runner-build.yaml
index a2fc272..b407b6c 100644
--- a/.github/workflows/tests-runner-build.yaml
+++ b/.github/workflows/tests-runner-build.yaml
@@ -29,4 +29,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/metalbear-co/ci-tests-runner-build:latest
\ No newline at end of file
+            ghcr.io/metalbear-co/ci-tests-runner-build:latest
+            ghcr.io/metalbear-co/ci-tests-runner:${{ github.sha }}
\ No newline at end of file