diff --git a/.woodpecker/docker-develop-combine.yaml b/.woodpecker/docker-develop-combine.yaml
index 67da6ca12..ebe5a502c 100644
--- a/.woodpecker/docker-develop-combine.yaml
+++ b/.woodpecker/docker-develop-combine.yaml
@@ -15,7 +15,10 @@ steps:
       registry: "git.fluffytail.org"
       image: "pleroma-test/pleroma"
       architectures: [amd64, arm64]
-      tags: [latest, develop]
+      tags:
+        - latest
+        - develop
+        - ${CI_COMMIT_SHA}
       username:
         from_secret: pleroma-ci-user
       password:
diff --git a/.woodpecker/docker-develop.yaml b/.woodpecker/docker-develop.yaml
index 1a61b1626..4f6bbdf12 100644
--- a/.woodpecker/docker-develop.yaml
+++ b/.woodpecker/docker-develop.yaml
@@ -33,7 +33,10 @@ steps:
       - evaluate: platform == "linux/amd64"
     settings:
       <<: *docker_variables
-      tags: [latest-amd64, develop-amd64]
+      tags:
+        - latest-amd64
+        - develop-amd64
+        - ${CI_COMMIT_SHA}-amd64
 
   docker-develop-arm64:
     image: woodpeckerci/plugin-kaniko:2.3.1
@@ -41,4 +44,7 @@ steps:
       - evaluate: platform == "linux/arm64"
     settings:
       <<: *docker_variables
-      tags: [latest-arm64, develop-arm64]
+      tags:
+        - latest-arm64
+        - develop-arm64
+        - ${CI_COMMIT_SHA}-arm64