diff --git a/build.sh b/build.sh
index f5c53d3..4e6642e 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@
 #
 # License: GPL-3.0+
 
-MIGRATED_IMAGE=$CI_REGISTRY_IMAGE/debian-$DEBIAN_VERSION/migrated
+MIGRATED_IMAGE=$CI_REGISTRY_IMAGE/migrated:debian-$DEBIAN_VERSION
 SUITE=$1
 ROOTFS=rootfs
 
diff --git a/migrate.sh b/migrate.sh
index e874639..67014b2 100755
--- a/migrate.sh
+++ b/migrate.sh
@@ -4,7 +4,7 @@
 #
 # License: GPL-3.0+
 
-IMAGE=$CI_REGISTRY_IMAGE/debian-$DEBIAN_VERSION/migrated
+IMAGE=$CI_REGISTRY_IMAGE/migrated:debian-$DEBIAN_VERSION
 STAMP=$(date +%F)
 SUITE=$(echo $DEBIAN_VERSION | sed 's/-.*//')
 
@@ -12,9 +12,9 @@ docker pull $IMAGE || true
 docker build \
        --build-arg VERSION=$DEBIAN_VERSION \
        --build-arg SUITE=$SUITE \
-       --tag $IMAGE:$STAMP \
+       --tag $IMAGE-$STAMP \
        --file migrate.df .
 
-docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE
+docker push $IMAGE-$STAMP
+docker tag  $IMAGE-$STAMP $IMAGE
 docker push $IMAGE