diff --git a/build.sh b/build.sh
index 4e6642e..3986d4e 100755
--- a/build.sh
+++ b/build.sh
@@ -26,10 +26,10 @@ ADD $ROOTFS.tar.gz /
 CMD ["bash"]
 EOF
 
-docker build -t $IMAGE:$STAMP .
+docker build -t $IMAGE:$SUITE-$STAMP .
 
-docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
+docker push $IMAGE:$SUITE-$STAMP
+docker tag  $IMAGE:$SUITE-$STAMP $IMAGE:$SUITE
 docker push $IMAGE:$SUITE
 if test $SUITE = $DEVUAN_RELEASE; then
     docker tag  $IMAGE:$SUITE $IMAGE
@@ -51,10 +51,10 @@ ADD $ROOTFS-slim.tar.gz /
 CMD ["bash"]
 EOF
 
-docker build -t $IMAGE:$STAMP .
+docker build -t $IMAGE:$SUITE-$STAMP .
 
-docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
+docker push $IMAGE:$SUITE-$STAMP
+docker tag  $IMAGE:$SUITE-$STAMP $IMAGE:$SUITE
 docker push $IMAGE:$SUITE
 if test $SUITE = $DEVUAN_RELEASE; then
     docker tag  $IMAGE:$SUITE $IMAGE
diff --git a/derive.sh b/derive.sh
index bed2d2d..ae7e5a7 100755
--- a/derive.sh
+++ b/derive.sh
@@ -12,11 +12,11 @@ STAMP=$(date +%F)
 
 docker build \
        --build-arg DEVUAN_IMAGE=$BASE_IMAGE \
-       --tag $IMAGE:$STAMP \
+       --tag $IMAGE:$SUITE-$STAMP \
        --file $(basename $IMAGE).df .
 
-docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
+docker push $IMAGE:$SUITE-$STAMP
+docker tag  $IMAGE:$SUITE-$STAMP $IMAGE:$SUITE
 docker push $IMAGE:$SUITE
 if test $SUITE = $DEVUAN_RELEASE; then
     docker tag  $IMAGE:$SUITE $IMAGE
@@ -28,11 +28,11 @@ IMAGE=$CI_REGISTRY_IMAGE/helper
 
 docker build \
        --build-arg DEVUAN_IMAGE=$BASE_IMAGE \
-       --tag $IMAGE:$STAMP \
+       --tag $IMAGE:$SUITE-$STAMP \
        --file $(basename $IMAGE).df .
 
-docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
+docker push $IMAGE:$SUITE-$STAMP
+docker tag  $IMAGE:$SUITE-$STAMP $IMAGE:$SUITE
 docker push $IMAGE:$SUITE
 if test $SUITE = $DEVUAN_RELEASE; then
     docker tag  $IMAGE:$SUITE $IMAGE