diff --git a/org.jdrupes.vmoperator.manager/build.gradle b/org.jdrupes.vmoperator.manager/build.gradle
index 63f54ec..38e43f1 100644
--- a/org.jdrupes.vmoperator.manager/build.gradle
+++ b/org.jdrupes.vmoperator.manager/build.gradle
@@ -60,6 +60,9 @@ task tagLatestImage(type: Exec) {
     enabled = !project.version.contains("SNAPSHOT")
         && !project.version.contains("alpha") \
         && !project.version.contains("beta") \
+        || project.rootProject.properties['docker.testRegistry'] \
+            && project.rootProject.properties['docker.registry'] \
+            == project.rootProject.properties['docker.testRegistry']
 
     commandLine 'podman', 'tag', "${project.name}:${project.version}",\
         "${project.name}:latest"
@@ -85,6 +88,9 @@ task pushLatestImage(type: Exec) {
     enabled = !project.version.contains("SNAPSHOT")
         && !project.version.contains("alpha") \
         && !project.version.contains("beta") \
+        || project.rootProject.properties['docker.testRegistry'] \
+            && project.rootProject.properties['docker.registry'] \
+            == project.rootProject.properties['docker.testRegistry']
 
     commandLine 'podman', 'push', '--tls-verify=false', \
         "localhost/${project.name}:${project.version}", \
diff --git a/org.jdrupes.vmoperator.runner.qemu/build.gradle b/org.jdrupes.vmoperator.runner.qemu/build.gradle
index ec7de7f..3a5a4b7 100644
--- a/org.jdrupes.vmoperator.runner.qemu/build.gradle
+++ b/org.jdrupes.vmoperator.runner.qemu/build.gradle
@@ -45,6 +45,9 @@ task tagLatestArchImage(type: Exec) {
     enabled = !project.version.contains("SNAPSHOT")
         && !project.version.contains("alpha") \
         && !project.version.contains("beta") \
+        || project.rootProject.properties['docker.testRegistry'] \
+            && project.rootProject.properties['docker.registry'] \
+            == project.rootProject.properties['docker.testRegistry']
 
     commandLine 'podman', 'tag', "${project.name}-arch:${project.version}",\
         "${project.name}-arch:latest"
@@ -70,6 +73,9 @@ task pushArchLatestImage(type: Exec) {
     enabled = !project.version.contains("SNAPSHOT")
         && !project.version.contains("alpha") \
         && !project.version.contains("beta") \
+        || project.rootProject.properties['docker.testRegistry'] \
+            && project.rootProject.properties['docker.registry'] \
+            == project.rootProject.properties['docker.testRegistry']
 
     commandLine 'podman', 'push', '--tls-verify=false', \
         "localhost/${project.name}-arch:${project.version}", \
@@ -91,6 +97,9 @@ task tagLatestAlpineImage(type: Exec) {
     enabled = !project.version.contains("SNAPSHOT")
         && !project.version.contains("alpha") \
         && !project.version.contains("beta") \
+        || project.rootProject.properties['docker.testRegistry'] \
+            && project.rootProject.properties['docker.registry'] \
+            == project.rootProject.properties['docker.testRegistry']
 
     commandLine 'podman', 'tag', "${project.name}-alpine:${project.version}",\
         "${project.name}-alpine:latest"
@@ -116,6 +125,9 @@ task pushAlpineLatestImage(type: Exec) {
     enabled = !project.version.contains("SNAPSHOT")
         && !project.version.contains("alpha") \
         && !project.version.contains("beta") \
+        || project.rootProject.properties['docker.testRegistry'] \
+            && project.rootProject.properties['docker.registry'] \
+            == project.rootProject.properties['docker.testRegistry']
 
     commandLine 'podman', 'push', '--tls-verify=false', \
         "localhost/${project.name}-alpine:${project.version}", \