diff --git a/.gitlab/ci/imagebuilder.yml b/.gitlab/ci/imagebuilder.yml
index e121979..281c8d0 100644
--- a/.gitlab/ci/imagebuilder.yml
+++ b/.gitlab/ci/imagebuilder.yml
@@ -7,11 +7,11 @@ build-imagebuilder_x86-64:
     TARGET=$(echo "$CI_JOB_NAME" | cut -d _ -f 2-)
     VERSION="${VERSION:-snapshot}"
     docker tag "$DOCKER_IMAGE:$TARGET-$VERSION" \
-      "$DOCKER_IMAGE:imagebuilder-$TARGET-$CI_COMMIT_REF_SLUG"
-    docker push "$DOCKER_IMAGE:imagebuilder-$TARGET-$CI_COMMIT_REF_SLUG"
+      "$DOCKER_IMAGE:imagebuilder-$TARGET-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
+    docker push "$DOCKER_IMAGE:imagebuilder-$TARGET-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
 
 test-imagebuilder:
-  image: "$CI_REGISTRY_IMAGE:imagebuilder-x86-64-$CI_COMMIT_REF_SLUG"
+  image: "$CI_REGISTRY_IMAGE:imagebuilder-x86-64-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
   stage: test
   script:
     - cd /home/build/openwrt/
diff --git a/.gitlab/ci/rootfs.yml b/.gitlab/ci/rootfs.yml
index ac0095e..db043fa 100644
--- a/.gitlab/ci/rootfs.yml
+++ b/.gitlab/ci/rootfs.yml
@@ -11,11 +11,11 @@ build-rootfs_x86-64:
     TARGET=$(echo "$CI_JOB_NAME" | cut -d _ -f 2-)
     VERSION="${VERSION:-snapshot}"
     docker tag "$DOCKER_IMAGE:$TARGET-$VERSION" \
-      "$DOCKER_IMAGE:rootfs-$TARGET-$CI_COMMIT_REF_SLUG"
-    docker push "$DOCKER_IMAGE:rootfs-$TARGET-$CI_COMMIT_REF_SLUG"
+      "$DOCKER_IMAGE:rootfs-$TARGET-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
+    docker push "$DOCKER_IMAGE:rootfs-$TARGET-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
 
 test-rootfs:
-  image: "$CI_REGISTRY_IMAGE:rootfs-x86-64-$CI_COMMIT_REF_SLUG"
+  image: "$CI_REGISTRY_IMAGE:rootfs-x86-64-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
   stage: test
   except:
     variables:
diff --git a/.gitlab/ci/sdk.yml b/.gitlab/ci/sdk.yml
index a4db514..49ecb46 100644
--- a/.gitlab/ci/sdk.yml
+++ b/.gitlab/ci/sdk.yml
@@ -7,8 +7,8 @@
     bash docker-sdk.sh
     VERSION="${VERSION:-snapshot}"
     docker tag "$DOCKER_IMAGE:$TARGETS-$VERSION" \
-      "$DOCKER_IMAGE:sdk-$TARGETS-$CI_COMMIT_REF_SLUG"
-    docker push "$DOCKER_IMAGE:sdk-$TARGETS-$CI_COMMIT_REF_SLUG"
+      "$DOCKER_IMAGE:sdk-$TARGETS-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
+    docker push "$DOCKER_IMAGE:sdk-$TARGETS-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
 
 build-sdk_x86_64:
   variables:
@@ -40,12 +40,12 @@ build-sdk_mips_24kc:
 
 test-sdk_x86_64:
   extends: .test-sdk
-  image: "$CI_REGISTRY_IMAGE:sdk-x86-64-$CI_COMMIT_REF_SLUG"
+  image: "$CI_REGISTRY_IMAGE:sdk-x86-64-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
   script:
     - ls ./bin/packages/x86_64/base/busybox*
 
 test-sdk_mips_24kc:
   extends: .test-sdk
-  image: "$CI_REGISTRY_IMAGE:sdk-ath79-generic-$CI_COMMIT_REF_SLUG"
+  image: "$CI_REGISTRY_IMAGE:sdk-ath79-generic-$CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID"
   script:
     - ls ./bin/packages/mips_24kc/base/busybox*