diff --git a/config.json b/config.json
index 8c7a91a..d92c493 100644
--- a/config.json
+++ b/config.json
@@ -1912,39 +1912,39 @@
                 "_EXTRA_TAGS=\"$_PV_MAJOR $_PV_MAJOR_MINOR\""
             ],
             "step1" : {
-                "shortname" : "Build 'base' container",
-                "BBTARGETS" : "container-base",
-                "CONTAINER_IMAGE_MAP" : {"container-base": "base"},
+                "shortname" : "Build 'base' multiarch container",
+                "BBTARGETS" : "container-image-multiarch-container-base",
+                "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-container-base": "base"},
                 "CONTAINER_VERSION_RECIPE" : "base-files"
             },
             "step2" : {
-                "shortname" : "Build 'curl' container",
-                "BBTARGETS" : "app-container-curl",
-                "CONTAINER_IMAGE_MAP" : {"app-container-curl": "curl"},
+                "shortname" : "Build 'curl' multiarch container",
+                "BBTARGETS" : "container-image-multiarch-app-container-curl",
+                "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-curl": "curl"},
                 "CONTAINER_VERSION_RECIPE" : "curl"
             },
             "step3" : {
                 "shortname" : "Build 'python' container",
-                "BBTARGETS" : "app-container-python",
-                "CONTAINER_IMAGE_MAP" : {"app-container-python": "python"},
+                "BBTARGETS" : "container-image-multiarch-app-container-python",
+                "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-python": "python"},
                 "CONTAINER_VERSION_RECIPE" : "python3"
             },
             "step4" : {
                 "shortname" : "Build 'mosquitto' container",
-                "BBTARGETS" : "app-container-mosquitto",
-                "CONTAINER_IMAGE_MAP" : {"app-container-mosquitto": "mosquitto"},
+                "BBTARGETS" : "container-image-multiarch-app-container-mosquitto",
+                "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-mosquitto": "mosquitto"},
                 "CONTAINER_VERSION_RECIPE" : "mosquitto"
             },
             "step5" : {
                 "shortname" : "Build 'valkey' container",
-                "BBTARGETS" : "app-container-valkey",
-                "CONTAINER_IMAGE_MAP" : {"app-container-valkey": "valkey"},
+                "BBTARGETS" : "container-image-multiarch-app-container-valkey",
+                "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-valkey": "valkey"},
                 "CONTAINER_VERSION_RECIPE" : "valkey"
             },
             "step6" : {
                 "shortname" : "Build 'nginx' container",
-                "BBTARGETS" : "app-container-nginx",
-                "CONTAINER_IMAGE_MAP" : {"app-container-nginx": "nginx"},
+                "BBTARGETS" : "container-image-multiarch-app-container-nginx",
+                "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-nginx": "nginx"},
                 "CONTAINER_VERSION_RECIPE" : "nginx"
             }
         }