diff --git a/docker_images.yml b/docker_images.yml
index e316bed..fff1524 100644
--- a/docker_images.yml
+++ b/docker_images.yml
@@ -110,13 +110,13 @@
   - name: xosproject/xos-ws
     repo: xos-rest-gw
 
+  - name: xosproject/xos-gui-builder
+    repo: xos-gui
+    dockerfile: "Dockerfile.xos-gui-builder"
+
   - name: xosproject/xos-gui
     repo: xos-gui
 
-  - name: xosproject/xos-gui-extension-builder
-    repo: xos-gui
-    dockerfile: "Dockerfile.xos-gui-extension-builder"
-
   - name: xosproject/gui-extension-rcord
     repo: rcord
     path: "xos/gui"
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index 2ffd2b4..2777461 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -110,7 +110,7 @@
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
-  - "xosproject/xos-gui-extension-builder"
+  - "xosproject/xos-gui-builder"
   - "xosproject/xos-libraries"
   - "xosproject/xos-postgres"
   - "xosproject/xos-tosca"
diff --git a/scenarios/local/config.yml b/scenarios/local/config.yml
index 56c8d80..ad683ce 100644
--- a/scenarios/local/config.yml
+++ b/scenarios/local/config.yml
@@ -41,7 +41,7 @@
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
-  - "xosproject/xos-gui-extension-builder"
+  - "xosproject/xos-gui-builder"
   - "xosproject/xos-libraries"
   - "xosproject/xos-postgres"
   - "xosproject/xos-tosca"
diff --git a/scenarios/mock/config.yml b/scenarios/mock/config.yml
index f248911..30b1d7c 100644
--- a/scenarios/mock/config.yml
+++ b/scenarios/mock/config.yml
@@ -61,7 +61,7 @@
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
-  - "xosproject/xos-gui-extension-builder"
+  - "xosproject/xos-gui-builder"
   - "xosproject/xos-libraries"
   - "xosproject/xos-postgres"
   - "xosproject/xos-synchronizer-base"
diff --git a/scenarios/opencloud/config.yml b/scenarios/opencloud/config.yml
index 13909fa..6012071 100644
--- a/scenarios/opencloud/config.yml
+++ b/scenarios/opencloud/config.yml
@@ -94,7 +94,7 @@
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
-  - "xosproject/xos-gui-extension-builder"
+  - "xosproject/xos-gui-builder"
   - "xosproject/xos-libraries"
   - "xosproject/xos-postgres"
   - "xosproject/xos-tosca"
diff --git a/scenarios/single/config.yml b/scenarios/single/config.yml
index 22c8d78..bb2c360 100644
--- a/scenarios/single/config.yml
+++ b/scenarios/single/config.yml
@@ -63,7 +63,7 @@
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
-  - "xosproject/xos-gui-extension-builder"
+  - "xosproject/xos-gui-builder"
   - "xosproject/xos-libraries"
   - "xosproject/xos-postgres"
   - "xosproject/xos-tosca"