diff --git a/build/docker-bedrock.yml b/build/docker-bedrock.yml
index 9881dde..8514ef6 100644
--- a/build/docker-bedrock.yml
+++ b/build/docker-bedrock.yml
@@ -27,7 +27,7 @@ docker-build:review:
 docker-build:staging:
     extends: .docker-build
     variables:
-        IMAGE_TAG: "${CI_REGISTRY_IMAGE}:staging"
+        IMAGE_TAG: "${CI_REGISTRY_IMAGE}:s-${CI_COMMIT_SHA}"
     rules:
         - if: $CI_COMMIT_BRANCH == "trunk"
 
@@ -35,7 +35,7 @@ docker-build:staging:
 docker-build:latest:
     extends: .docker-build
     variables:
-        IMAGE_TAG: "${CI_REGISTRY_IMAGE}:latest"
+        IMAGE_TAG: "${CI_REGISTRY_IMAGE}:p-${CI_COMMIT_SHA}"
     rules:
         - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
 
diff --git a/build/docker.yml b/build/docker.yml
index 4f058d2..affcf7c 100644
--- a/build/docker.yml
+++ b/build/docker.yml
@@ -30,7 +30,7 @@ docker-build:review:
 docker-build:staging:
     extends: .docker-build
     variables:
-        IMAGE_TAG: "${CI_REGISTRY_IMAGE}:staging"
+        IMAGE_TAG: "${CI_REGISTRY_IMAGE}:s-${CI_COMMIT_SHA}"
     rules:
         - if: $CI_COMMIT_BRANCH == "trunk"
 
@@ -38,7 +38,7 @@ docker-build:staging:
 docker-build:latest:
     extends: .docker-build
     variables:
-        IMAGE_TAG: "${CI_REGISTRY_IMAGE}:latest"
+        IMAGE_TAG: "${CI_REGISTRY_IMAGE}:p-${CI_COMMIT_SHA}"
     rules:
         - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"