diff --git a/buildone b/buildone
index 1713ce5..b7a7c56 100755
--- a/buildone
+++ b/buildone
@@ -34,8 +34,6 @@ set -u
 set -o pipefail
 
 BASENAME=bitnami/minideb
-GCR_BASENAME=gcr.io/bitnami-containers/minideb
-QUAY_BASENAME=quay.io/bitnami/minideb
 
 LATEST=buster
 
@@ -92,13 +90,9 @@ build() {
         fi
     fi
     docker tag "$built_image_id" "$BASENAME:$DIST"
-    docker tag "$built_image_id" "$QUAY_BASENAME:$DIST"
-    docker tag "$built_image_id" "$GCR_BASENAME:$DIST"
-    log "Tagged $built_image_id as $BASENAME:$DIST $QUAY_BASENAME:$DIST $GCR_BASENAME:$DIST"
+    log "Tagged $built_image_id as $BASENAME:$DIST"
     if [ "$DIST" == "$LATEST" ]; then
         docker tag "$BASENAME:$DIST" "$BASENAME:latest"
-        docker tag "$QUAY_BASENAME:$DIST" "$QUAY_BASENAME:latest"
-        docker tag "$GCR_BASENAME:$DIST" "$GCR_BASENAME:latest"
     fi
 }
 
diff --git a/pushall b/pushall
index fe40a25..ba02e57 100755
--- a/pushall
+++ b/pushall
@@ -38,6 +38,8 @@ fi
 
 for DIST in $DISTS; do
     DOCKER_CONTENT_TRUST=${ENABLE_DOCKER_CONTENT_TRUST} docker push "${BASENAME}:${DIST}"
+    docker tag "${BASENAME}:${DIST}" "${QUAY_BASENAME}:${DIST}"
+    docker tag "${BASENAME}:${DIST}" "${GCR_BASENAME}:${DIST}"
     docker push "${QUAY_BASENAME}:${DIST}"
     gcloud docker -- push "${GCR_BASENAME}:${DIST}"
 done