Merge "Use a single configuration file for specifying docker containers."

77 files changed, 154 insertions, 1081 deletions

diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index 115a592c..70b43eb1 100644
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized aodh service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerAodhApiImage:
     description: image
-    default: 'centos-binary-aodh-api:latest'
     type: string
   DockerAodhConfigImage:
     description: The container image to use for the aodh config_volume
-    default: 'centos-binary-aodh-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -81,10 +75,7 @@ outputs:
         config_volume: aodh
         puppet_tags: aodh_api_paste_ini,aodh_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
+        config_image: {get_param: DockerAodhConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/aodh_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -101,10 +92,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           aodh_init_log:
-            image: &aodh_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerAodhApiImage} ]
+            image: &aodh_api_image {get_param: DockerAodhApiImage}
             user: root
             volumes:
               - /var/log/containers/aodh:/var/log/aodh
diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml
index 127a5f30..f75c57b3 100644
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Aodh Evaluator service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerAodhEvaluatorImage:
     description: image
-    default: 'centos-binary-aodh-evaluator:latest'
     type: string
   DockerAodhConfigImage:
     description: The container image to use for the aodh config_volume
-    default: 'centos-binary-aodh-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: aodh
         puppet_tags: aodh_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
+        config_image: {get_param: DockerAodhConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/aodh_evaluator.json:
           command: /usr/bin/aodh-evaluator
@@ -93,10 +84,7 @@ outputs:
       docker_config:
         step_4:
           aodh_evaluator:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerAodhEvaluatorImage} ]
+            image: {get_param: DockerAodhEvaluatorImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml
index 0e485ee4..9db2ffbe 100644
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Aodh Listener service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerAodhListenerImage:
     description: image
-    default: 'centos-binary-aodh-listener:latest'
     type: string
   DockerAodhConfigImage:
     description: The container image to use for the aodh config_volume
-    default: 'centos-binary-aodh-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: aodh
         puppet_tags: aodh_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
+        config_image: {get_param: DockerAodhConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/aodh_listener.json:
           command: /usr/bin/aodh-listener
@@ -93,10 +84,7 @@ outputs:
       docker_config:
         step_4:
           aodh_listener:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerAodhListenerImage} ]
+            image: {get_param: DockerAodhListenerImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml
index a0fa72d6..c16c0161 100644
--- a/docker/services/aodh-notifier.yaml
+++ b/docker/services/aodh-notifier.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Aodh Notifier service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerAodhNotifierImage:
     description: image
-    default: 'centos-binary-aodh-notifier:latest'
     type: string
   DockerAodhConfigImage:
     description: The container image to use for the aodh config_volume
-    default: 'centos-binary-aodh-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: aodh
         puppet_tags: aodh_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
+        config_image: {get_param: DockerAodhConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/aodh_notifier.json:
           command: /usr/bin/aodh-notifier
@@ -93,10 +84,7 @@ outputs:
       docker_config:
         step_4:
           aodh_notifier:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerAodhNotifierImage} ]
+            image: {get_param: DockerAodhNotifierImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml
index b9a75e33..f8ba4eea 100644
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Ceilometer Agent Central service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCeilometerCentralImage:
     description: image
-    default: 'centos-binary-ceilometer-central:latest'
     type: string
   DockerCeilometerConfigImage:
     description: The container image to use for the ceilometer config_volume
-    default: 'centos-binary-ceilometer-central:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: ceilometer
         puppet_tags: ceilometer_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
+        config_image: {get_param: DockerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer_agent_central.json:
           command: /usr/bin/ceilometer-polling --polling-namespaces central
@@ -88,10 +79,7 @@ outputs:
         step_3:
           ceilometer_init_log:
             start_order: 0
-            image: &ceilometer_agent_central_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerCentralImage} ]
+            image: &ceilometer_agent_central_image {get_param: DockerCeilometerCentralImage}
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
             volumes:
diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml
index b1c25ce4..09677c64 100644
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Ceilometer Agent Compute service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCeilometerComputeImage:
     description: image
-    default: 'centos-binary-ceilometer-compute:latest'
     type: string
   DockerCeilometerConfigImage:
     description: The container image to use for the ceilometer config_volume
-    default: 'centos-binary-ceilometer-central:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: ceilometer
         puppet_tags: ceilometer_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
+        config_image: {get_param: DockerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer_agent_compute.json:
           command: /usr/bin/ceilometer-polling --polling-namespaces compute
@@ -87,10 +78,7 @@ outputs:
       docker_config:
         step_4:
           ceilometer_agent_compute:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerComputeImage} ]
+            image: {get_param: DockerCeilometerComputeImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml
index a18d58d7..82d55be2 100644
--- a/docker/services/ceilometer-agent-ipmi.yaml
+++ b/docker/services/ceilometer-agent-ipmi.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Ceilometer Agent Ipmi service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCeilometerIpmiImage:
     description: image
-    default: 'centos-binary-ceilometer-ipmi:latest'
     type: string
   DockerCeilometerConfigImage:
     description: The container image to use for the ceilometer config_volume
-    default: 'centos-binary-ceilometer-central:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: ceilometer
         puppet_tags: ceilometer_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
+        config_image: {get_param: DockerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer-agent-ipmi.json:
           command: /usr/bin/ceilometer-polling --polling-namespaces ipmi
@@ -88,10 +79,7 @@ outputs:
         step_3:
           ceilometer_init_log:
             start_order: 0
-            image: &ceilometer_agent_ipmi_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerIpmiImage} ]
+            image: &ceilometer_agent_ipmi_image {get_param: DockerCeilometerIpmiImage}
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
             volumes:
diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml
index d9e22c89..7f1d442a 100644
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Ceilometer Agent Notification service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCeilometerNotificationImage:
     description: image
-    default: 'centos-binary-ceilometer-notification:latest'
     type: string
   DockerCeilometerConfigImage:
     description: The container image to use for the ceilometer config_volume
-    default: 'centos-binary-ceilometer-central:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: ceilometer
         puppet_tags: ceilometer_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
+        config_image: {get_param: DockerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer_agent_notification.json:
           command: /usr/bin/ceilometer-agent-notification
@@ -88,10 +79,7 @@ outputs:
         step_3:
           ceilometer_init_log:
             start_order: 0
-            image: &ceilometer_agent_notification_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerNotificationImage} ]
+            image: &ceilometer_agent_notification_image {get_param: DockerCeilometerNotificationImage}
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
             volumes:
diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index baadb217..0cd1dd7b 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Cinder API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCinderApiImage:
     description: image
-    default: 'centos-binary-cinder-api:latest'
     type: string
   DockerCinderConfigImage:
     description: The container image to use for the cinder config_volume
-    default: 'centos-binary-cinder-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -79,10 +73,7 @@ outputs:
         config_volume: cinder
         puppet_tags: cinder_config,file,concat,file_line
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCinderConfigImage} ]
+        config_image: {get_param: DockerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -98,10 +89,7 @@ outputs:
       docker_config:
         step_2:
           cinder_api_init_logs:
-            image: &cinder_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCinderApiImage} ]
+            image: &cinder_api_image {get_param: DockerCinderApiImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml
index 29fc4624..46dbea1d 100644
--- a/docker/services/cinder-backup.yaml
+++ b/docker/services/cinder-backup.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Cinder Backup service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCinderBackupImage:
     description: image
-    default: 'centos-binary-cinder-backup:latest'
     type: string
   DockerCinderConfigImage:
     description: The container image to use for the cinder config_volume
-    default: 'centos-binary-cinder-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         config_volume: cinder
         puppet_tags: cinder_config,file,concat,file_line
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCinderConfigImage} ]
+        config_image: {get_param: DockerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_backup.json:
           command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -104,10 +95,7 @@ outputs:
         step_3:
           cinder_backup_init_logs:
             start_order: 0
-            image: &cinder_backup_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCinderBackupImage} ]
+            image: &cinder_backup_image {get_param: DockerCinderBackupImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml
index d9962efb..1bae005c 100644
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Cinder Scheduler service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCinderSchedulerImage:
     description: image
-    default: 'centos-binary-cinder-scheduler:latest'
     type: string
   DockerCinderConfigImage:
     description: The container image to use for the cinder config_volume
-    default: 'centos-binary-cinder-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         config_volume: cinder
         puppet_tags: cinder_config,file,concat,file_line
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCinderConfigImage} ]
+        config_image: {get_param: DockerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_scheduler.json:
           command: /usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -92,10 +83,7 @@ outputs:
       docker_config:
         step_2:
           cinder_scheduler_init_logs:
-            image: &cinder_scheduler_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCinderSchedulerImage} ]
+            image: &cinder_scheduler_image {get_param: DockerCinderSchedulerImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml
index 210ab4c9..1f9003e6 100644
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Cinder Volume service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCinderVolumeImage:
     description: image
-    default: 'centos-binary-cinder-volume:latest'
     type: string
   DockerCinderConfigImage:
     description: The container image to use for the cinder config_volume
-    default: 'centos-binary-cinder-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -81,10 +75,7 @@ outputs:
         config_volume: cinder
         puppet_tags: cinder_config,file,concat,file_line
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCinderConfigImage} ]
+        config_image: {get_param: DockerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_volume.json:
           command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -109,10 +100,7 @@ outputs:
         step_3:
           cinder_volume_init_logs:
             start_order: 0
-            image: &cinder_volume_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCinderVolumeImage} ]
+            image: &cinder_volume_image {get_param: DockerCinderVolumeImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index 29d81cd4..2989729c 100644
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -4,17 +4,11 @@ description: >
   Containerized collectd service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCollectdImage:
     description: image
-    default: 'centos-binary-collectd:latest'
     type: string
   DockerCollectdConfigImage:
     description: The container image to use for the collectd config_volume
-    default: 'centos-binary-collectd:latest'
     type: string
   EndpointMap:
     default: {}
@@ -77,10 +71,7 @@ outputs:
         config_volume: collectd
         puppet_tags:  collectd_client_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCollectdConfigImage} ]
+        config_image: {get_param: DockerCollectdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/collectd.json:
           command: /usr/sbin/collectd -f
@@ -96,10 +87,7 @@ outputs:
       docker_config:
         step_3:
           collectd:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ]
+            image: {get_param: DockerCollectdImage}
             net: host
             privileged: true
             restart: always
diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml
index 41fefd4b..e49682f9 100644
--- a/docker/services/congress.yaml
+++ b/docker/services/congress.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Congress API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCongressApiImage:
     description: image
-    default: 'centos-binary-congress-api:latest'
     type: string
   DockerCongressConfigImage:
     description: The container image to use for the congress config_volume
-    default: 'centos-binary-congress-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: congress
         puppet_tags: congress_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCongressConfigImage} ]
+        config_image: {get_param: DockerCongressConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/congress_api.json:
           command: /usr/bin/congress-server --config-file=/etc/congress/congress.conf --log-file=/var/log/congress/api.log
@@ -94,10 +85,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           congress_init_logs:
-            image: &congress_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCongressApiImage} ]
+            image: &congress_api_image {get_param: DockerCongressApiImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 62e20094..5ba79b31 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -4,17 +4,11 @@ description: >
   MongoDB service deployment using puppet and docker
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMongodbImage:
     description: image
-    default: 'centos-binary-mongodb:latest'
     type: string
   DockerMongodbConfigImage:
     description: The container image to use for the mongodb config_volume
-    default: 'centos-binary-mongodb:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: mongodb
         puppet_tags: file # set this even though file is the default
         step_config: *step_config
-        config_image: &mongodb_config_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMongodbConfigImage} ]
+        config_image: &mongodb_config_image {get_param: DockerMongodbConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mongodb.json:
           command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run
@@ -96,10 +87,7 @@ outputs:
       docker_config:
         step_2:
           mongodb:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ]
+            image: {get_param: DockerMongodbImage}
             net: host
             privileged: false
             volumes: &mongodb_volumes
diff --git a/docker/services/database/mysql-client.yaml b/docker/services/database/mysql-client.yaml
index 9e51aeab..d45d58e1 100644
--- a/docker/services/database/mysql-client.yaml
+++ b/docker/services/database/mysql-client.yaml
@@ -4,13 +4,8 @@ description: >
   Configuration for containerized MySQL clients
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMysqlClientConfigImage:
     description: The container image to use for the mysql_client config_volume
-    default: 'centos-binary-mariadb:latest'
     type: string
   ServiceData:
     default: {}
@@ -62,9 +57,6 @@ outputs:
         config_volume: mysql_client
         puppet_tags: file # set this even though file is the default
         step_config: "include ::tripleo::profile::base::database::mysql::client"
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMysqlClientConfigImage} ]
+        config_image: {get_param: DockerMysqlClientConfigImage}
       # no need for a docker config, this service only generates configuration files
       docker_config: {}
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 40744bbf..54331415 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -4,17 +4,11 @@ description: >
   MySQL service deployment using puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMysqlImage:
     description: image
-    default: 'centos-binary-mariadb:latest'
     type: string
   DockerMysqlConfigImage:
     description: The container image to use for the mysql config_volume
-    default: 'centos-binary-mariadb:latest'
     type: string
   EndpointMap:
     default: {}
@@ -83,10 +77,7 @@ outputs:
         config_volume: mysql
         puppet_tags: file # set this even though file is the default
         step_config: *step_config
-        config_image: &mysql_config_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMysqlConfigImage} ]
+        config_image: &mysql_config_image {get_param: DockerMysqlConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mysql.json:
           command: /usr/bin/mysqld_safe
@@ -103,10 +94,7 @@ outputs:
         # Kolla_bootstrap runs before permissions set by kolla_config
         step_1:
           mysql_init_logs:
-            image: &mysql_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
+            image: &mysql_image {get_param: DockerMysqlImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index 8696d216..980a8c6d 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Redis services
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerRedisImage:
     description: image
-    default: 'centos-binary-redis:latest'
     type: string
   DockerRedisConfigImage:
     description: The container image to use for the redis config_volume
-    default: 'centos-binary-redis:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         # https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
         puppet_tags: 'exec'
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerRedisConfigImage} ]
+        config_image: {get_param: DockerRedisConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/redis.json:
           command: /usr/bin/redis-server /etc/redis.conf
@@ -94,10 +85,7 @@ outputs:
           redis_init_logs:
             start_order: 0
             detach: false
-            image: &redis_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerRedisImage} ]
+            image: &redis_image {get_param: DockerRedisImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml
index 607d76c7..9f1ecbc1 100644
--- a/docker/services/ec2-api.yaml
+++ b/docker/services/ec2-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized EC2 API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerEc2ApiImage:
     description: image
-    default: 'centos-binary-ec2-api:latest'
     type: string
   DockerEc2ApiConfigImage:
     description: The container image to use for the ec2_api config_volume
-    default: 'centos-binary-ec2-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -71,10 +65,7 @@ outputs:
         config_volume: ec2_api
         puppet_tags: ec2api_api_paste_ini,ec2api_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiConfigImage} ]
+        config_image: {get_param: DockerEc2ApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ec2_api.json:
           command: /usr/bin/ec2-api
@@ -102,10 +93,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           ec2_api_init_logs:
-            image: &ec2_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiImage} ]
+            image: &ec2_api_image {get_param: DockerEc2ApiImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml
index 5edee26a..42c9f2d3 100644
--- a/docker/services/etcd.yaml
+++ b/docker/services/etcd.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized etcd services
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerEtcdImage:
     description: image
-    default: 'centos-binary-etcd:latest'
     type: string
   DockerEtcdConfigImage:
     description: The container image to use for the etcd config_volume
-    default: 'centos-binary-etcd:latest'
     type: string
   EndpointMap:
     default: {}
@@ -76,10 +70,7 @@ outputs:
       puppet_config:
         config_volume: etcd
         step_config: *step_config
-        config_image: &etcd_config_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerEtcdConfigImage} ]
+        config_image: &etcd_config_image {get_param: DockerEtcdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/etcd.json:
           command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml
@@ -95,10 +86,7 @@ outputs:
       docker_config:
         step_2:
           etcd:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerEtcdImage} ]
+            image: {get_param: DockerEtcdImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index d5991605..d88c64b5 100644
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Glance service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerGlanceApiImage:
     description: image
-    default: 'centos-binary-glance-api:latest'
     type: string
   DockerGlanceApiConfigImage:
     description: The container image to use for the glance_api config_volume
-    default: 'centos-binary-glance-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -83,10 +77,7 @@ outputs:
         config_volume: glance_api
         puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiConfigImage} ]
+        config_image: {get_param: DockerGlanceApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/glance_api.json:
           command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf
@@ -106,10 +97,7 @@ outputs:
         # Kolla_bootstrap/db_sync runs before permissions set by kolla_config
         step_2:
           glance_init_logs:
-            image: &glance_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ]
+            image: &glance_api_image {get_param: DockerGlanceApiImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index d2e8f09b..5129b89f 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized gnocchi service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerGnocchiApiImage:
     description: image
-    default: 'centos-binary-gnocchi-api:latest'
     type: string
   DockerGnocchiConfigImage:
     description: The container image to use for the gnocchi config_volume
-    default: 'centos-binary-gnocchi-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -81,10 +75,7 @@ outputs:
         config_volume: gnocchi
         puppet_tags: gnocchi_api_paste_ini,gnocchi_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiConfigImage} ]
+        config_image: {get_param: DockerGnocchiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/gnocchi_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -101,10 +92,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           gnocchi_init_log:
-            image: &gnocchi_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiApiImage} ]
+            image: &gnocchi_api_image {get_param: DockerGnocchiApiImage}
             user: root
             volumes:
               - /var/log/containers/gnocchi:/var/log/gnocchi
diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml
index c8da61fe..1a0a1ddb 100644
--- a/docker/services/gnocchi-metricd.yaml
+++ b/docker/services/gnocchi-metricd.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Gnocchi Metricd service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerGnocchiMetricdImage:
     description: image
-    default: 'centos-binary-gnocchi-metricd:latest'
     type: string
   DockerGnocchiConfigImage:
     description: The container image to use for the gnocchi config_volume
-    default: 'centos-binary-gnocchi-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: gnocchi
         puppet_tags: gnocchi_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiConfigImage} ]
+        config_image: {get_param: DockerGnocchiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/gnocchi_metricd.json:
           command: /usr/bin/gnocchi-metricd
@@ -91,10 +82,7 @@ outputs:
       docker_config:
         step_4:
           gnocchi_metricd:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiMetricdImage} ]
+            image: {get_param: DockerGnocchiMetricdImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml
index fea6b4b1..00d218d2 100644
--- a/docker/services/gnocchi-statsd.yaml
+++ b/docker/services/gnocchi-statsd.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Gnocchi Statsd service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerGnocchiStatsdImage:
     description: image
-    default: 'centos-binary-gnocchi-statsd:latest'
     type: string
   DockerGnocchiConfigImage:
     description: The container image to use for the gnocchi config_volume
-    default: 'centos-binary-gnocchi-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: gnocchi
         puppet_tags: gnocchi_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiConfigImage} ]
+        config_image: {get_param: DockerGnocchiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/gnocchi_statsd.json:
           command: /usr/bin/gnocchi-statsd
@@ -91,10 +82,7 @@ outputs:
       docker_config:
         step_4:
           gnocchi_statsd:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiStatsdImage} ]
+            image: {get_param: DockerGnocchiStatsdImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml
index 5fc9b2bd..21baf5c6 100644
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized HAproxy service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerHAProxyImage:
     description: image
-    default: 'centos-binary-haproxy:latest'
     type: string
   DockerHAProxyConfigImage:
     description: The container image to use for the haproxy config_volume
-    default: 'centos-binary-haproxy:latest'
     type: string
   ServiceData:
     default: {}
@@ -99,10 +93,7 @@ outputs:
         config_volume: haproxy
         puppet_tags: haproxy_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyConfigImage} ]
+        config_image: {get_param: DockerHAProxyConfigImage}
         volumes: &deployed_cert_mount
           - list_join:
             - ':'
@@ -120,10 +111,7 @@ outputs:
       docker_config:
         step_1:
           haproxy:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyImage} ]
+            image: {get_param: DockerHAProxyImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml
index c4129852..aff0f1a1 100644
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@@ -4,18 +4,12 @@ description: >
   OpenStack containerized Heat API CFN service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerHeatApiCfnImage:
     description: image
-    default: 'centos-binary-heat-api-cfn:latest'
     type: string
   # puppet needs the heat-wsgi-api-cfn binary from centos-binary-heat-api-cfn
   DockerHeatApiCfnConfigImage:
     description: The container image to use for the heat_api_cfn config_volume
-    default: 'centos-binary-heat-api-cfn:latest'
     type: string
   EndpointMap:
     default: {}
@@ -83,10 +77,7 @@ outputs:
         config_volume: heat_api_cfn
         puppet_tags: heat_config,file,concat,file_line
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnConfigImage} ]
+        config_image: {get_param: DockerHeatApiCfnConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/heat_api_cfn.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -102,10 +93,7 @@ outputs:
       docker_config:
         step_4:
           heat_api_cfn:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnImage} ]
+            image: {get_param: DockerHeatApiCfnImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index 4a250963..d09230fe 100644
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -4,18 +4,12 @@ description: >
   OpenStack containerized Heat API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerHeatApiImage:
     description: image
-    default: 'centos-binary-heat-api:latest'
     type: string
   # puppet needs the heat-wsgi-api binary from centos-binary-heat-api
   DockerHeatApiConfigImage:
     description: The container image to use for the heat_api config_volume
-    default: 'centos-binary-heat-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -83,10 +77,7 @@ outputs:
         config_volume: heat_api
         puppet_tags: heat_config,file,concat,file_line
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiConfigImage} ]
+        config_image: {get_param: DockerHeatApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/heat_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -102,10 +93,7 @@ outputs:
       docker_config:
         step_4:
           heat_api:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiImage} ]
+            image: {get_param: DockerHeatApiImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index 8cad7089..789f3f9d 100644
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Heat Engine service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerHeatEngineImage:
     description: image
-    default: 'centos-binary-heat-engine:latest'
     type: string
   DockerHeatConfigImage:
     description: The container image to use for the heat config_volume
-    default: 'centos-binary-heat-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -76,10 +70,7 @@ outputs:
         config_volume: heat
         puppet_tags: heat_config,file,concat,file_line
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ]
+        config_image: {get_param: DockerHeatConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/heat_engine.json:
           command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
@@ -96,10 +87,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           heat_init_log:
-            image: &heat_engine_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
+            image: &heat_engine_image {get_param: DockerHeatEngineImage}
             user: root
             volumes:
               - /var/log/containers/heat:/var/log/heat
diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index 222b0128..3d3bc7c3 100644
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Horizon service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerHorizonImage:
     description: image
-    default: 'centos-binary-horizon:latest'
     type: string
   DockerHorizonConfigImage:
     description: The container image to use for the horizon config_volume
-    default: 'centos-binary-horizon:latest'
     type: string
   EndpointMap:
     default: {}
@@ -79,10 +73,7 @@ outputs:
         config_volume: horizon
         puppet_tags: horizon_config
         step_config: {get_attr: [HorizonBase, role_data, step_config]}
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHorizonConfigImage} ]
+        config_image: {get_param: DockerHorizonConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/horizon.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -102,10 +93,7 @@ outputs:
       docker_config:
         step_2:
           horizon_fix_perms:
-            image: &horizon_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerHorizonImage} ]
+            image: &horizon_image {get_param: DockerHorizonImage}
             user: root
             # NOTE Set ownership for /var/log/horizon/horizon.log file here,
             # otherwise it's created by root when generating django cache.
diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 6af2743a..90978f3e 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Ironic API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerIronicApiImage:
     description: image
-    default: 'centos-binary-ironic-api:latest'
     type: string
   DockerIronicApiConfigImage:
     description: The container image to use for the ironic_api config_volume
-    default: 'centos-binary-ironic-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -75,10 +69,7 @@ outputs:
         config_volume: ironic_api
         puppet_tags: ironic_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerIronicApiConfigImage} ]
+        config_image: {get_param: DockerIronicApiConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ironic_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -95,10 +86,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           ironic_init_logs:
-            image: &ironic_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ]
+            image: &ironic_api_image {get_param: DockerIronicApiImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index 7e17ec52..6368bd23 100644
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Ironic Conductor service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerIronicConductorImage:
     description: image
-    default: 'centos-binary-ironic-conductor:latest'
     type: string
   DockerIronicConfigImage:
     description: The container image to use for the ironic config_volume
-    default: 'centos-binary-ironic-pxe:latest'
     type: string
   EndpointMap:
     default: {}
@@ -82,10 +76,7 @@ outputs:
         config_volume: ironic
         puppet_tags: ironic_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
+        config_image: {get_param: DockerIronicConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ironic_conductor.json:
           command: /usr/bin/ironic-conductor
@@ -105,10 +96,7 @@ outputs:
         step_4:
           ironic_conductor:
             start_order: 80
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerIronicConductorImage} ]
+            image: {get_param: DockerIronicConductorImage}
             net: host
             privileged: true
             restart: always
diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml
index 06f2bfec..48d2e1ee 100644
--- a/docker/services/ironic-pxe.yaml
+++ b/docker/services/ironic-pxe.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Ironic PXE service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerIronicPxeImage:
     description: image
-    default: 'centos-binary-ironic-pxe:latest'
     type: string
   DockerIronicConfigImage:
     description: The container image to use for the ironic config_volume
-    default: 'centos-binary-ironic-pxe:latest'
     type: string
   EndpointMap:
     default: {}
@@ -61,10 +55,7 @@ outputs:
         config_volume: ironic
         puppet_tags: ironic_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
+        config_image: {get_param: DockerIronicConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ironic_pxe_http.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -88,10 +79,7 @@ outputs:
         step_4:
           ironic_pxe_tftp:
             start_order: 90
-            image: &ironic_pxe_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
+            image: &ironic_pxe_image {get_param: DockerIronicPxeImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml
index c6674db8..b39b72e2 100644
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Iscsid service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerIscsidImage:
     description: image
-    default: 'centos-binary-iscsid:latest'
     type: string
   DockerIscsidConfigImage:
     description: The container image to use for the iscsid config_volume
-    default: 'centos-binary-iscsid:latest'
     type: string
   EndpointMap:
     default: {}
@@ -61,10 +55,7 @@ outputs:
         config_volume: iscsid
         #puppet_tags: file
         step_config: ''
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerIscsidConfigImage} ]
+        config_image: {get_param: DockerIscsidConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/iscsid.json:
           command: /usr/sbin/iscsid -f
@@ -72,10 +63,7 @@ outputs:
         step_3:
           iscsid:
             start_order: 2
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerIscsidImage} ]
+            image: {get_param: DockerIscsidImage}
             net: host
             privileged: true
             restart: always
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 6fabceca..da04682e 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Keystone service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerKeystoneImage:
     description: image
-    default: 'centos-binary-keystone:latest'
     type: string
   DockerKeystoneConfigImage:
     description: The container image to use for the keystone config_volume
-    default: 'centos-binary-keystone:latest'
     type: string
   EndpointMap:
     default: {}
@@ -95,10 +89,7 @@ outputs:
         config_volume: keystone
         puppet_tags: keystone_config
         step_config: *step_config
-        config_image: &keystone_config_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneConfigImage} ]
+        config_image: &keystone_config_image {get_param: DockerKeystoneConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/keystone.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -111,10 +102,7 @@ outputs:
         # Kolla_bootstrap/db sync runs before permissions set by kolla_config
         step_2:
           keystone_init_log:
-            image: &keystone_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ]
+            image: &keystone_image {get_param: DockerKeystoneImage}
             user: root
             command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R keystone:keystone /var/log/keystone']
             volumes:
diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml
index 5e144233..c33f4094 100644
--- a/docker/services/manila-api.yaml
+++ b/docker/services/manila-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Manila API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerManilaApiImage:
     description: image
-    default: 'centos-binary-manila-api:latest'
     type: string
   DockerManilaConfigImage:
     description: The container image to use for the manila config_volume
-    default: 'centos-binary-manila-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -70,10 +64,7 @@ outputs:
         config_volume: manila
         puppet_tags: manila_config,manila_api_paste_ini
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerManilaConfigImage} ]
+        config_image: {get_param: DockerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_api.json:
           command: /usr/bin/manila-api --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
@@ -89,10 +80,7 @@ outputs:
       docker_config:
         step_2:
           manila_init_logs:
-            image: &manila_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerManilaApiImage} ]
+            image: &manila_api_image {get_param: DockerManilaApiImage}
             user: root
             volumes:
               - /var/log/containers/manila:/var/log/manila
diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml
index 06b1cdd8..730d33f6 100644
--- a/docker/services/manila-scheduler.yaml
+++ b/docker/services/manila-scheduler.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Manila Scheduler service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerManilaSchedulerImage:
     description: image
-    default: 'centos-binary-manila-scheduler:latest'
     type: string
   DockerManilaConfigImage:
     description: The container image to use for the manila config_volume
-    default: 'centos-binary-manila-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -70,10 +64,7 @@ outputs:
         config_volume: manila
         puppet_tags: manila_config,manila_scheduler_paste_ini
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerManilaConfigImage} ]
+        config_image: {get_param: DockerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_scheduler.json:
           command: /usr/bin/manila-scheduler --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
@@ -89,10 +80,7 @@ outputs:
       docker_config:
         step_4:
           manila_scheduler:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerManilaSchedulerImage} ]
+            image: {get_param: DockerManilaSchedulerImage}
             net: host
             restart: always
             volumes:
diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml
index 951ec8d0..7e28bdc1 100644
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Memcached services
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMemcachedImage:
     description: image
-    default: 'centos-binary-memcached:latest'
     type: string
   DockerMemcachedConfigImage:
     description: The container image to use for the memcached config_volume
-    default: 'centos-binary-memcached:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,20 +66,14 @@ outputs:
         config_volume: 'memcached'
         puppet_tags: 'file'
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMemcachedConfigImage} ]
+        config_image: {get_param: DockerMemcachedConfigImage}
       kolla_config: {}
       docker_config:
         step_1:
           memcached_init_logs:
             start_order: 0
             detach: false
-            image: &memcached_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMemcachedImage} ]
+            image: &memcached_image {get_param: DockerMemcachedImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index 739e0870..73db3742 100644
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Mistral API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMistralApiImage:
     description: image
-    default: 'centos-binary-mistral-api:latest'
     type: string
   DockerMistralConfigImage:
     description: The container image to use for the mistral config_volume
-    default: 'centos-binary-mistral-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: mistral
         puppet_tags: mistral_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
+        config_image: {get_param: DockerMistralConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mistral_api.json:
           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/api.log --server=api
@@ -94,10 +85,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           mistral_init_logs:
-            image: &mistral_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
+            image: &mistral_api_image {get_param: DockerMistralApiImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml
index 7d271e9e..4c6b300d 100644
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Mistral Engine service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMistralEngineImage:
     description: image
-    default: 'centos-binary-mistral-engine:latest'
     type: string
   DockerMistralConfigImage:
     description: The container image to use for the mistral config_volume
-    default: 'centos-binary-mistral-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -75,10 +69,7 @@ outputs:
         config_volume: mistral
         puppet_tags: mistral_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
+        config_image: {get_param: DockerMistralConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mistral_engine.json:
           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/engine.log --server=engine
@@ -94,10 +85,7 @@ outputs:
       docker_config:
         step_4:
           mistral_engine:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMistralEngineImage} ]
+            image: {get_param: DockerMistralEngineImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index a0a36902..3346a049 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Mistral Executor service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMistralExecutorImage:
     description: image
-    default: 'centos-binary-mistral-executor:latest'
     type: string
   DockerMistralConfigImage:
     description: The container image to use for the mistral config_volume
-    default: 'centos-binary-mistral-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -75,10 +69,7 @@ outputs:
         config_volume: mistral
         puppet_tags: mistral_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
+        config_image: {get_param: DockerMistralConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mistral_executor.json:
           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor
@@ -94,10 +85,7 @@ outputs:
       docker_config:
         step_4:
           mistral_executor:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMistralExecutorImage} ]
+            image: {get_param: DockerMistralExecutorImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml
index e9866fe3..51b93029 100644
--- a/docker/services/multipathd.yaml
+++ b/docker/services/multipathd.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Multipathd service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMultipathdImage:
     description: image
-    default: 'centos-binary-multipathd:latest'
     type: string
   DockerMultipathdConfigImage:
     description: The container image to use for the multipathd config_volume
-    default: 'centos-binary-multipathd:latest'
     type: string
   EndpointMap:
     default: {}
@@ -61,10 +55,7 @@ outputs:
         config_volume: multipathd
         #puppet_tags: file
         step_config: ''
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMultipathdConfigImage} ]
+        config_image: {get_param: DockerMultipathdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/multipathd.json:
           command: /usr/sbin/multipathd -d
@@ -72,10 +63,7 @@ outputs:
         step_3:
           multipathd:
             start_order: 1
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMultipathdImage} ]
+            image: {get_param: DockerMultipathdImage}
             net: host
             privileged: true
             restart: always
diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index a7947105..547deaf0 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Neutron API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNeutronApiImage:
     description: image
-    default: 'centos-binary-neutron-server:latest'
     type: string
   DockerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
-    default: 'centos-binary-neutron-server:latest'
     type: string
   EndpointMap:
     default: {}
@@ -81,10 +75,7 @@ outputs:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_api_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+        config_image: {get_param: DockerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_api.json:
           command: /usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-server
@@ -108,10 +99,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           neutron_init_logs:
-            image: &neutron_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNeutronApiImage} ]
+            image: &neutron_api_image {get_param: DockerNeutronApiImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml
index 99ccba3c..c7444070 100644
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Neutron DHCP service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNeutronDHCPImage:
     description: image
-    default: 'centos-binary-neutron-dhcp-agent:latest'
     type: string
   DockerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
-    default: 'centos-binary-neutron-server:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_dhcp_agent_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+        config_image: {get_param: DockerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_dhcp.json:
           command: /usr/bin/neutron-dhcp-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --log-file /var/log/neutron/dhcp-agent.log --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent
@@ -93,10 +84,7 @@ outputs:
       docker_config:
         step_4:
           neutron_dhcp:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNeutronDHCPImage} ]
+            image: {get_param: DockerNeutronDHCPImage}
             net: host
             pid: host
             privileged: true
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index 13428eed..c3a4d27f 100644
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Neutron L3 agent
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNeutronL3AgentImage:
     description: image
-    default: 'centos-binary-neutron-l3-agent:latest'
     type: string
   DockerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
-    default: 'centos-binary-neutron-server:latest'
     type: string
   ServiceData:
     default: {}
@@ -70,10 +64,7 @@ outputs:
         puppet_tags: neutron_config,neutron_l3_agent_config
         config_volume: neutron
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+        config_image: {get_param: DockerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_l3_agent.json:
           command: /usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent
@@ -89,10 +80,7 @@ outputs:
       docker_config:
         step_4:
           neutron_l3_agent:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
+            image: {get_param: DockerNeutronL3AgentImage}
             net: host
             pid: host
             privileged: true
diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml
index dee4fd20..f030faef 100644
--- a/docker/services/neutron-metadata.yaml
+++ b/docker/services/neutron-metadata.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Neutron Metadata agent
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNeutronMetadataImage:
     description: image
-    default: 'centos-binary-neutron-metadata-agent:latest'
     type: string
   DockerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
-    default: 'centos-binary-neutron-server:latest'
     type: string
   ServiceData:
     default: {}
@@ -70,10 +64,7 @@ outputs:
         puppet_tags: neutron_config,neutron_metadata_agent_config
         config_volume: neutron
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+        config_image: {get_param: DockerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_metadata_agent.json:
           command: /usr/bin/neutron-metadata-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-metadata-agent
@@ -89,10 +80,7 @@ outputs:
       docker_config:
         step_4:
           neutron_metadata_agent:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNeutronMetadataImage} ]
+            image: {get_param: DockerNeutronMetadataImage}
             net: host
             pid: host
             privileged: true
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index dd2bc743..4cce23d9 100644
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Neutron openvswitch service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerOpenvswitchImage:
     description: image
-    default: 'centos-binary-neutron-openvswitch-agent:latest'
     type: string
   DockerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
-    default: 'centos-binary-neutron-server:latest'
     type: string
   ServiceData:
     default: {}
@@ -70,10 +64,7 @@ outputs:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+        config_image: {get_param: DockerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_ovs_agent.json:
           command: /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron/conf.d/common
@@ -89,10 +80,7 @@ outputs:
       docker_config:
         step_4:
           neutron_ovs_agent:
-            image:
-              list_join:
-              - '/'
-              - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
+            image: {get_param: DockerOpenvswitchImage}
             net: host
             pid: host
             privileged: true
diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml
index 9865afdf..8d12e0de 100644
--- a/docker/services/neutron-plugin-ml2.yaml
+++ b/docker/services/neutron-plugin-ml2.yaml
@@ -19,16 +19,10 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNeutronConfigImage:
     description: The container image to use for the neutron config_volume
-    default: 'centos-binary-neutron-server:latest'
     type: string
   DefaultPasswords:
-    default: {}
     type: json
   RoleName:
     default: ''
@@ -67,9 +61,6 @@ outputs:
         config_volume: 'neutron'
         puppet_tags: neutron_plugin_ml2
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+        config_image: {get_param: DockerNeutronConfigImage}
       kolla_config: {}
       docker_config: {}
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index f8355c1a..1d73a538 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Nova API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaApiImage:
     description: image
-    default: 'centos-binary-nova-api:latest'
     type: string
   DockerNovaConfigImage:
     description: The container image to use for the nova config_volume
-    default: 'centos-binary-nova-base:latest'
     type: string
   EndpointMap:
     default: {}
@@ -81,10 +75,7 @@ outputs:
         config_volume: nova
         puppet_tags: nova_config
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
+        config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_api.json:
           command: /usr/bin/nova-api
@@ -101,10 +92,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           nova_init_logs:
-            image: &nova_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNovaApiImage} ]
+            image: &nova_api_image {get_param: DockerNovaApiImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 4816d360..d8e76925 100644
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Nova Compute service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaComputeImage:
     description: image
-    default: 'centos-binary-nova-compute:latest'
     type: string
   DockerNovaLibvirtConfigImage:
     description: The container image to use for the nova_libvirt config_volume
-    default: 'centos-binary-nova-compute:latest'
     type: string
   ServiceData:
     default: {}
@@ -78,10 +72,7 @@ outputs:
         config_volume: nova_libvirt
         puppet_tags: nova_config,nova_paste_api_ini
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaLibvirtConfigImage} ]
+        config_image: {get_param: DockerNovaLibvirtConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_compute.json:
           command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
@@ -101,10 +92,7 @@ outputs:
         # FIXME: run discover hosts here
         step_4:
           nova_compute:
-            image: &nova_compute_image
-              list_join:
-              - '/'
-              - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
+            image: &nova_compute_image {get_param: DockerNovaComputeImage}
             net: host
             privileged: true
             user: nova
diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml
index af6e2b73..9f666577 100644
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Nova Conductor service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaConductorImage:
     description: image
-    default: 'centos-binary-nova-conductor:latest'
     type: string
   DockerNovaConfigImage:
     description: The container image to use for the nova config_volume
-    default: 'centos-binary-nova-base:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         config_volume: nova
         puppet_tags: nova_config
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
+        config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_conductor.json:
           command: /usr/bin/nova-conductor
@@ -92,10 +83,7 @@ outputs:
       docker_config:
         step_4:
           nova_conductor:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNovaConductorImage} ]
+            image: {get_param: DockerNovaConductorImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml
index 11e69ba4..0d3d1ec9 100644
--- a/docker/services/nova-consoleauth.yaml
+++ b/docker/services/nova-consoleauth.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Nova Consoleauth service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaConsoleauthImage:
     description: image
-    default: 'centos-binary-nova-consoleauth:latest'
     type: string
   DockerNovaConfigImage:
     description: The container image to use for the nova config_volume
-    default: 'centos-binary-nova-base:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: nova
         puppet_tags: nova_config
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
+        config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_consoleauth.json:
           command: /usr/bin/nova-consoleauth
@@ -91,10 +82,7 @@ outputs:
       docker_config:
         step_4:
           nova_consoleauth:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNovaConsoleauthImage} ]
+            image: {get_param: DockerNovaConsoleauthImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 69830466..89ef95ea 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Nova Ironic Compute service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaComputeIronicImage:
     description: image
-    default: 'centos-binary-nova-compute-ironic:latest'
     type: string
   DockerNovaConfigImage:
     description: The container image to use for the nova config_volume
-    default: 'centos-binary-nova-base:latest'
     type: string
   ServiceData:
     default: {}
@@ -70,10 +64,7 @@ outputs:
         config_volume: nova
         puppet_tags: nova_config,nova_paste_api_ini
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
+        config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_ironic.json:
           command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
@@ -92,10 +83,7 @@ outputs:
       docker_config:
         step_5:
           nova_compute:
-            image:
-              list_join:
-              - '/'
-              - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeIronicImage} ]
+            image: {get_param: DockerNovaComputeIronicImage}
             net: host
             privileged: true
             user: root
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index 6257bcd0..a5527747 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -4,19 +4,13 @@ description: >
   OpenStack Libvirt Service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaLibvirtImage:
     description: image
-    default: 'centos-binary-nova-libvirt:latest'
     type: string
   # we configure libvirt via the nova-compute container due to coupling
   # in the puppet modules
   DockerNovaLibvirtConfigImage:
     description: The container image to use for the nova_libvirt config_volume
-    default: 'centos-binary-nova-compute:latest'
     type: string
   EnablePackageInstall:
     default: 'false'
@@ -104,10 +98,7 @@ outputs:
         config_volume: nova_libvirt
         puppet_tags: nova_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerNovaLibvirtConfigImage} ]
+        config_image: {get_param: DockerNovaLibvirtConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_libvirt.json:
           command:
@@ -127,10 +118,7 @@ outputs:
       docker_config:
         step_3:
           nova_libvirt:
-            image:
-              list_join:
-              - '/'
-              - [ {get_param: DockerNamespace}, {get_param: DockerNovaLibvirtImage} ]
+            image: {get_param: DockerNovaLibvirtImage}
             net: host
             pid: host
             privileged: true
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 18055bb3..7350db20 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Nova Placement API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaPlacementImage:
     description: image
-    default: 'centos-binary-nova-placement-api:latest'
     type: string
   DockerNovaPlacementConfigImage:
     description: The container image to use for the nova_placement config_volume
-    default: 'centos-binary-nova-placement-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -75,10 +69,7 @@ outputs:
         config_volume: nova_placement
         puppet_tags: nova_config
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementConfigImage} ]
+        config_image: {get_param: DockerNovaPlacementConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_placement.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -96,10 +87,7 @@ outputs:
         step_3:
           nova_placement:
             start_order: 1
-            image:
-              list_join:
-              - '/'
-              - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
+            image: {get_param: DockerNovaPlacementImage}
             net: host
             user: root
             restart: always
diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml
index ffc4fc61..5c1aa308 100644
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Nova Scheduler service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaSchedulerImage:
     description: image
-    default: 'centos-binary-nova-scheduler:latest'
     type: string
   DockerNovaConfigImage:
     description: The container image to use for the nova config_volume
-    default: 'centos-binary-nova-base:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: nova
         puppet_tags: nova_config
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
+        config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_scheduler.json:
           command: /usr/bin/nova-scheduler
@@ -91,10 +82,7 @@ outputs:
       docker_config:
         step_4:
           nova_scheduler:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNovaSchedulerImage} ]
+            image: {get_param: DockerNovaSchedulerImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml
index 542af8c5..37831ff7 100644
--- a/docker/services/nova-vnc-proxy.yaml
+++ b/docker/services/nova-vnc-proxy.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Nova Vncproxy service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerNovaVncProxyImage:
     description: image
-    default: 'centos-binary-nova-novncproxy:latest'
     type: string
   DockerNovaConfigImage:
     description: The container image to use for the nova config_volume
-    default: 'centos-binary-nova-base:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: nova
         puppet_tags: nova_config
         step_config: *step_config
-        config_image:
-          list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
+        config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_vnc_proxy.json:
           command: /usr/bin/nova-novncproxy --web /usr/share/novnc/
@@ -91,10 +82,7 @@ outputs:
       docker_config:
         step_4:
           nova_vnc_proxy:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerNovaVncProxyImage} ]
+            image: {get_param: DockerNovaVncProxyImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml
index ecd66e61..f5b4baec 100644
--- a/docker/services/octavia-api.yaml
+++ b/docker/services/octavia-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Octavia service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerOctaviaApiImage:
     description: image
-    default: 'centos-binary-octavia-api:latest'
     type: string
   DockerOctaviaConfigImage:
     description: The container image to use for the octavia config_volume
-    default: 'centos-binary-octavia-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -80,10 +74,7 @@ outputs:
         config_volume: octavia
         puppet_tags: octavia_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
+        config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_api.json:
           command: /usr/bin/octavia-api --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/api.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-api
@@ -104,10 +95,7 @@ outputs:
         step_2:
           octavia_api_init_dirs:
             start_order: 0
-            image: &octavia_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaApiImage} ]
+            image: &octavia_api_image {get_param: DockerOctaviaApiImage}
             user: root
             volumes:
               # NOTE(mandre) we need extra dir for the service in /etc/octavia/conf.d
diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml
index 04b51c0a..f5e1eda5 100644
--- a/docker/services/octavia-health-manager.yaml
+++ b/docker/services/octavia-health-manager.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Octavia health-manager service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerOctaviaHealthManagerImage:
     description: image
-    default: 'centos-binary-octavia-health-manager:latest'
     type: string
   DockerOctaviaConfigImage:
     description: The container image to use for the octavia config_volume
-    default: 'centos-binary-octavia-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         config_volume: octavia
         puppet_tags: octavia_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
+        config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_health_manager.json:
           command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-health-manager
@@ -89,10 +80,7 @@ outputs:
         step_2:
           octavia_health_manager_init_dirs:
             start_order: 0
-            image: &octavia_health_manager_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHealthManagerImage} ]
+            image: &octavia_health_manager_image {get_param: DockerOctaviaHealthManagerImage}
             user: root
             volumes:
               # NOTE(mandre) we need extra dir for the service in /etc/octavia/conf.d
diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml
index 4414ad9c..1dc0db37 100644
--- a/docker/services/octavia-housekeeping.yaml
+++ b/docker/services/octavia-housekeeping.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Octavia service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerOctaviaHousekeepingImage:
     description: image
-    default: 'centos-binary-octavia-housekeeping:latest'
     type: string
   DockerOctaviaConfigImage:
     description: The container image to use for the octavia config_volume
-    default: 'centos-binary-octavia-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         config_volume: octavia
         puppet_tags: octavia_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
+        config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_housekeeping.json:
           command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping
@@ -89,10 +80,7 @@ outputs:
         step_2:
           octavia_housekeeping_init_dirs:
             start_order: 0
-            image: &octavia_housekeeping_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHousekeepingImage} ]
+            image: &octavia_housekeeping_image {get_param: DockerOctaviaHousekeepingImage}
             user: root
             volumes:
               # NOTE(mandre) we need extra dir for the service in /etc/octavia/conf.d
diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml
index d0bcd0b0..d29e1a3a 100644
--- a/docker/services/octavia-worker.yaml
+++ b/docker/services/octavia-worker.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Octavia worker service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerOctaviaWorkerImage:
     description: image
-    default: 'centos-binary-octavia-worker:latest'
     type: string
   DockerOctaviaConfigImage:
     description: The container image to use for the octavia config_volume
-    default: 'centos-binary-octavia-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         config_volume: octavia
         puppet_tags: octavia_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
+        config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_worker.json:
           command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-worker
@@ -89,10 +80,7 @@ outputs:
         step_2:
           octavia_worker_init_dirs:
             start_order: 0
-            image: &octavia_worker_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaWorkerImage} ]
+            image: &octavia_worker_image {get_param: DockerOctaviaWorkerImage}
             user: root
             volumes:
               # NOTE(mandre) we need extra dir for the service in /etc/octavia/conf.d
diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml
index 860ee1e2..ee8ee124 100644
--- a/docker/services/pacemaker/cinder-backup.yaml
+++ b/docker/services/pacemaker/cinder-backup.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Cinder Backup service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCinderBackupImage:
     description: image
-    default: 'centos-binary-cinder-backup:latest'
     type: string
   DockerCinderConfigImage:
     description: The container image to use for the cinder config_volume
-    default: 'centos-binary-cinder-api:latest'
     type: string
   CinderBackupBackend:
     default: swift
@@ -79,10 +73,7 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [CinderBackupBase, role_data, config_settings]
-          - tripleo::profile::pacemaker::cinder::backup_bundle::cinder_backup_docker_image: &cinder_backup_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCinderBackupImage} ]
+          - tripleo::profile::pacemaker::cinder::backup_bundle::cinder_backup_docker_image: &cinder_backup_image {get_param: DockerCinderBackupImage}
             cinder::backup::manage_service: false
             cinder::backup::enabled: false
       step_config: ""
@@ -92,10 +83,7 @@ outputs:
         config_volume: cinder
         puppet_tags: cinder_config,file,concat,file_line
         step_config: {get_attr: [CinderBackupBase, role_data, step_config]}
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCinderConfigImage} ]
+        config_image: {get_param: DockerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_backup.json:
           command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml
index 901c1606..d016cf83 100644
--- a/docker/services/pacemaker/cinder-volume.yaml
+++ b/docker/services/pacemaker/cinder-volume.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Cinder Volume service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCinderVolumeImage:
     description: image
-    default: 'centos-binary-cinder-volume:latest'
     type: string
   DockerCinderConfigImage:
     description: The container image to use for the cinder config_volume
-    default: 'centos-binary-cinder-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, config_settings]
-          - tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image: &cinder_volume_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCinderVolumeImage} ]
+          - tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image: &cinder_volume_image {get_param: DockerCinderVolumeImage}
             cinder::volume::manage_service: false
             cinder::volume::enabled: false
             cinder::host: hostgroup
@@ -86,10 +77,7 @@ outputs:
         config_volume: cinder
         puppet_tags: cinder_config,file,concat,file_line
         step_config: {get_attr: [CinderBase, role_data, step_config]}
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCinderConfigImage} ]
+        config_image: {get_param: DockerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_volume.json:
           command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
diff --git a/docker/services/pacemaker/clustercheck.yaml b/docker/services/pacemaker/clustercheck.yaml
index a17d11d8..c7c316a4 100644
--- a/docker/services/pacemaker/clustercheck.yaml
+++ b/docker/services/pacemaker/clustercheck.yaml
@@ -6,17 +6,11 @@ description: >
   the local galera node is synced
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerClustercheckImage:
     description: image
-    default: 'centos-binary-mariadb:latest'
     type: string
   DockerClustercheckConfigImage:
     description: The container image to use for the clustercheck config_volume
-    default: 'centos-binary-mariadb:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: clustercheck
         puppet_tags: file # set this even though file is the default
         step_config: "include ::tripleo::profile::pacemaker::clustercheck"
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerClustercheckConfigImage} ]
+        config_image: {get_param: DockerClustercheckConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/clustercheck.json:
           command: /usr/sbin/xinetd -dontfork
@@ -88,10 +79,7 @@ outputs:
         step_2:
           clustercheck:
             start_order: 1
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerClustercheckImage} ]
+            image: {get_param: DockerClustercheckImage}
             restart: always
             net: host
             volumes:
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index b87c381a..f38cccfc 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@ -4,17 +4,11 @@ description: >
   MySQL service deployment with pacemaker bundle
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMysqlImage:
     description: image
-    default: 'centos-binary-mariadb:latest'
     type: string
   DockerMysqlConfigImage:
     description: The container image to use for the mysql config_volume
-    default: 'centos-binary-mariadb:latest'
     type: string
   EndpointMap:
     default: {}
@@ -70,11 +64,7 @@ outputs:
       config_settings:
         map_merge:
           - {get_attr: [MysqlPuppetBase, role_data, config_settings]}
-          - tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image: &mysql_image
-              list_join:
-                - '/'
-                - - {get_param: DockerNamespace}
-                  - {get_param: DockerMysqlImage}
+          - tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image: &mysql_image {get_param: DockerMysqlImage}
       step_config: ""
       # BEGIN DOCKER SETTINGS #
       puppet_config:
@@ -86,10 +76,7 @@ outputs:
             - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
               - "exec {'wait-for-settle': command => '/bin/true' }"
               - "include ::tripleo::profile::pacemaker::database::mysql_bundle"
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMysqlConfigImage} ]
+        config_image: {get_param: DockerMysqlConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mysql.json:
           command: /usr/sbin/pacemaker_remoted
diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml
index 703d94d0..e124b045 100644
--- a/docker/services/pacemaker/database/redis.yaml
+++ b/docker/services/pacemaker/database/redis.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Redis services
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerRedisImage:
     description: image
-    default: 'centos-binary-redis:latest'
     type: string
   DockerRedisConfigImage:
     description: The container image to use for the redis config_volume
-    default: 'centos-binary-redis:latest'
     type: string
   EndpointMap:
     default: {}
@@ -66,11 +60,7 @@ outputs:
           - redis::service_manage: false
             redis::notify_service: false
             redis::managed_by_cluster_manager: true
-            tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image: &redis_image
-              list_join:
-                - '/'
-                - - {get_param: DockerNamespace}
-                  - {get_param: DockerRedisImage}
+            tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image: &redis_image {get_param: DockerRedisImage}
 
       step_config: ""
       service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
@@ -83,10 +73,7 @@ outputs:
         puppet_tags: 'exec'
         step_config:
           get_attr: [RedisBase, role_data, step_config]
-        config_image: &redis_config_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerRedisConfigImage} ]
+        config_image: &redis_config_image {get_param: DockerRedisConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/redis.json:
           command: /usr/sbin/pacemaker_remoted
diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml
index 9b0bdfe1..86c460fa 100644
--- a/docker/services/pacemaker/haproxy.yaml
+++ b/docker/services/pacemaker/haproxy.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized HAproxy service for pacemaker
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerHAProxyImage:
     description: image
-    default: 'centos-binary-haproxy:latest'
     type: string
   DockerHAProxyConfigImage:
     description: The container image to use for the haproxy config_volume
-    default: 'centos-binary-haproxy:latest'
     type: string
   ServiceData:
     default: {}
@@ -70,10 +64,7 @@ outputs:
           - get_attr: [HAProxyBase, role_data, config_settings]
           - tripleo::haproxy::haproxy_daemon: false
             haproxy_docker: true
-            tripleo::profile::pacemaker::haproxy_bundle::haproxy_docker_image: &haproxy_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyImage} ]
+            tripleo::profile::pacemaker::haproxy_bundle::haproxy_docker_image: &haproxy_image {get_param: DockerHAProxyImage}
       step_config: ""
       service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
@@ -87,10 +78,7 @@ outputs:
               - "class tripleo::firewall(){}; define tripleo::firewall::rule( $port = undef, $dport = undef, $sport = undef, $proto = undef, $action = undef, $state = undef, $source = undef, $iniface = undef, $chain = undef, $destination = undef, $extras = undef){}"
               - "['pcmk_bundle', 'pcmk_resource', 'pcmk_property', 'pcmk_constraint', 'pcmk_resource_default'].each |String $val| { noop_resource($val) }"
               - 'include ::tripleo::profile::pacemaker::haproxy_bundle'
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyConfigImage} ]
+        config_image: {get_param: DockerHAProxyConfigImage}
         volumes: &deployed_cert_mount
           - list_join:
             - ':'
diff --git a/docker/services/pacemaker/rabbitmq.yaml b/docker/services/pacemaker/rabbitmq.yaml
index 39f9dc3f..19af94b2 100644
--- a/docker/services/pacemaker/rabbitmq.yaml
+++ b/docker/services/pacemaker/rabbitmq.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Rabbitmq service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerRabbitmqImage:
     description: image
-    default: 'centos-binary-rabbitmq:latest'
     type: string
   DockerRabbitmqConfigImage:
     description: The container image to use for the rabbitmq config_volume
-    default: 'centos-binary-rabbitmq:latest'
     type: string
   EndpointMap:
     default: {}
@@ -68,11 +62,7 @@ outputs:
         map_merge:
           - {get_attr: [RabbitmqBase, role_data, config_settings]}
           - rabbitmq::service_manage: false
-            tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_image: &rabbitmq_image
-              list_join:
-                - '/'
-                - - {get_param: DockerNamespace}
-                  - {get_param: DockerRabbitmqImage}
+            tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_image: &rabbitmq_image {get_param: DockerRabbitmqImage}
       step_config: &step_config
         get_attr: [RabbitmqBase, role_data, step_config]
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
@@ -81,10 +71,7 @@ outputs:
         config_volume: rabbitmq
         puppet_tags: file
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqConfigImage} ]
+        config_image: {get_param: DockerRabbitmqConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/rabbitmq.json:
           command: /usr/sbin/pacemaker_remoted
diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml
index 6f10fd0d..ad2fa0f6 100644
--- a/docker/services/panko-api.yaml
+++ b/docker/services/panko-api.yaml
@@ -6,17 +6,11 @@ description: >
   will be disabled in future releases.
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerPankoApiImage:
     description: image
-    default: 'centos-binary-panko-api:latest'
     type: string
   DockerPankoConfigImage:
     description: The container image to use for the panko config_volume
-    default: 'centos-binary-panko-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -84,10 +78,7 @@ outputs:
         config_volume: panko
         puppet_tags: panko_api_paste_ini,panko_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerPankoConfigImage} ]
+        config_image: {get_param: DockerPankoConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/panko_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -103,10 +94,7 @@ outputs:
       docker_config:
         step_2:
           panko_init_log:
-            image: &panko_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerPankoApiImage} ]
+            image: &panko_api_image {get_param: DockerPankoApiImage}
             user: root
             volumes:
               - /var/log/containers/panko:/var/log/panko
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index a0dd75fb..418c60d2 100644
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Rabbitmq service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerRabbitmqImage:
     description: image
-    default: 'centos-binary-rabbitmq:latest'
     type: string
   DockerRabbitmqConfigImage:
     description: The container image to use for the rabbitmq config_volume
-    default: 'centos-binary-rabbitmq:latest'
     type: string
   EndpointMap:
     default: {}
@@ -82,10 +76,7 @@ outputs:
       puppet_config:
         config_volume: rabbitmq
         step_config: *step_config
-        config_image: &rabbitmq_config_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqConfigImage} ]
+        config_image: &rabbitmq_config_image {get_param: DockerRabbitmqConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/rabbitmq.json:
           command: /usr/lib/rabbitmq/bin/rabbitmq-server
@@ -104,10 +95,7 @@ outputs:
           rabbitmq_init_logs:
             start_order: 0
             detach: false
-            image: &rabbitmq_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ]
+            image: &rabbitmq_image {get_param: DockerRabbitmqImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml
index a1529adb..bff2fdac 100644
--- a/docker/services/sahara-api.yaml
+++ b/docker/services/sahara-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Sahara service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerSaharaApiImage:
     description: image
-    default: 'centos-binary-sahara-api:latest'
     type: string
   DockerSaharaConfigImage:
     description: The container image to use for the sahara config_volume
-    default: 'centos-binary-sahara-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         config_volume: sahara
         puppet_tags: sahara_api_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSaharaConfigImage} ]
+        config_image: {get_param: DockerSaharaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/sahara-api.json:
           command: /usr/bin/sahara-api --config-file /etc/sahara/sahara.conf
@@ -95,10 +86,7 @@ outputs:
       docker_config:
         step_3:
           sahara_db_sync:
-            image: &sahara_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSaharaApiImage} ]
+            image: &sahara_api_image {get_param: DockerSaharaApiImage}
             net: host
             privileged: false
             detach: false
diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml
index b7425b7e..01d4bb9c 100644
--- a/docker/services/sahara-engine.yaml
+++ b/docker/services/sahara-engine.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack Sahara service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerSaharaEngineImage:
     description: image
-    default: 'centos-binary-sahara-engine:latest'
     type: string
   DockerSaharaConfigImage:
     description: The container image to use for the sahara config_volume
-    default: 'centos-binary-sahara-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         config_volume: sahara
         puppet_tags: sahara_engine_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSaharaConfigImage} ]
+        config_image: {get_param: DockerSaharaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/sahara-engine.json:
           command: /usr/bin/sahara-engine --config-file /etc/sahara/sahara.conf
@@ -95,10 +86,7 @@ outputs:
       docker_config:
         step_4:
           sahara_engine:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSaharaEngineImage} ]
+            image: {get_param: DockerSaharaEngineImage}
             net: host
             privileged: false
             restart: always
diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml
index ad2fc256..b64231cd 100644
--- a/docker/services/sensu-client.yaml
+++ b/docker/services/sensu-client.yaml
@@ -4,17 +4,11 @@ description: >
   Containerized Sensu client service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerSensuClientImage:
     description: image
-    default: 'centos-binary-sensu-client:latest'
     type: string
   DockerSensuConfigImage:
     description: The container image to use for the sensu config_volume
-    default: 'centos-binary-sensu-client:latest'
     type: string
   EndpointMap:
     default: {}
@@ -107,10 +101,7 @@ outputs:
         config_volume: sensu
         puppet_tags:  sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSensuConfigImage} ]
+        config_image: {get_param: DockerSensuConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/sensu-client.json:
           command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log
@@ -126,10 +117,7 @@ outputs:
       docker_config:
         step_3:
           sensu_client:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSensuClientImage} ]
+            image: {get_param: DockerSensuClientImage}
             net: host
             privileged: true
             # NOTE(mmagr) kolla image changes the user to 'sensu', we need it
diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index 6ded962f..374db250 100644
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized swift proxy service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerSwiftProxyImage:
     description: image
-    default: 'centos-binary-swift-proxy-server:latest'
     type: string
   DockerSwiftConfigImage:
     description: The container image to use for the swift config_volume
-    default: 'centos-binary-swift-proxy-server:latest'
     type: string
   EndpointMap:
     default: {}
@@ -79,10 +73,7 @@ outputs:
         config_volume: swift
         puppet_tags: swift_proxy_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ]
+        config_image: {get_param: DockerSwiftConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/swift_proxy.json:
           command: /usr/bin/swift-proxy-server /etc/swift/proxy-server.conf
@@ -106,10 +97,7 @@ outputs:
         step_4:
           map_merge:
             - swift_proxy:
-                image: &swift_proxy_image
-                  list_join:
-                    - '/'
-                    - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
+                image: &swift_proxy_image {get_param: DockerSwiftProxyImage}
                 net: host
                 user: swift
                 restart: always
diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index f51d6c77..e4e2c7d2 100644
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@ -4,13 +4,8 @@ description: >
   OpenStack Swift Ringbuilder
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerSwiftConfigImage:
     description: The container image to use for the swift config_volume
-    default: 'centos-binary-swift-proxy-server:latest'
     type: string
   ServiceData:
     default: {}
@@ -100,9 +95,6 @@ outputs:
         config_volume: 'swift'
         puppet_tags: exec,fetch_swift_ring_tarball,extract_swift_ring_tarball,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance,create_swift_ring_tarball,upload_swift_ring_tarball
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ]
+        config_image: {get_param: DockerSwiftConfigImage}
       kolla_config: {}
       docker_config: {}
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 76e38f69..04e58b4a 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -4,25 +4,17 @@ description: >
   OpenStack containerized Swift Storage services.
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerSwiftProxyImage:
     description: image
-    default: 'centos-binary-swift-proxy-server:latest'
     type: string
   DockerSwiftAccountImage:
     description: image
-    default: 'centos-binary-swift-account:latest'
     type: string
   DockerSwiftContainerImage:
     description: image
-    default: 'centos-binary-swift-container:latest'
     type: string
   DockerSwiftObjectImage:
     description: image
-    default: 'centos-binary-swift-object:latest'
     type: string
   DockerSwiftConfigImage:
     description: The container image to use for the swift config_volume
@@ -93,10 +85,7 @@ outputs:
         config_volume: swift
         puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config,rsync::server
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ]
+        config_image: {get_param: DockerSwiftConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/swift_account_auditor.json:
           command: /usr/bin/swift-account-auditor /etc/swift/account-server.conf
@@ -206,10 +195,7 @@ outputs:
           # volume during the configuration stage.  We just need to create this
           # directory and make sure it's owned by swift.
           swift_setup_srv:
-            image: &swift_account_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+            image: &swift_account_image {get_param: DockerSwiftAccountImage}
             user: root
             command: ['chown', '-R', 'swift:', '/srv/node']
             volumes:
@@ -281,10 +267,7 @@ outputs:
                   - /var/log/containers/swift:/var/log/swift
             environment: *kolla_env
           swift_container_auditor:
-            image: &swift_container_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftContainerImage} ]
+            image: &swift_container_image {get_param: DockerSwiftContainerImage}
             net: host
             user: swift
             restart: always
@@ -348,10 +331,7 @@ outputs:
                   - /var/log/containers/swift:/var/log/swift
             environment: *kolla_env
           swift_object_auditor:
-            image: &swift_object_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftObjectImage} ]
+            image: &swift_object_image {get_param: DockerSwiftObjectImage}
             net: host
             user: swift
             restart: always
@@ -367,10 +347,7 @@ outputs:
                   - /var/log/containers/swift:/var/log/swift
             environment: *kolla_env
           swift_object_expirer:
-            image: &swift_proxy_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
+            image: &swift_proxy_image {get_param: DockerSwiftProxyImage}
             net: host
             user: swift
             restart: always
diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml
index 64cda1b3..cdcb4d2a 100644
--- a/docker/services/tacker.yaml
+++ b/docker/services/tacker.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Tacker service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerTackerImage:
     description: image
-    default: 'centos-binary-tacker:latest'
     type: string
   DockerTackerConfigImage:
     description: The container image to use for the tacker config_volume
-    default: 'centos-binary-tacker:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: tacker
         puppet_tags: tacker_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerTackerConfigImage} ]
+        config_image: {get_param: DockerTackerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/tacker_api.json:
           command: /usr/bin/tacker-server --config-file=/etc/tacker/tacker.conf --log-file=/var/log/tacker/api.log
@@ -94,10 +85,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           tacker_init_logs:
-            image: &tacker_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerTackerImage} ]
+            image: &tacker_image {get_param: DockerTackerImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index ddd80903..85a84550 100644
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Zaqar services
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerZaqarImage:
     description: image
-    default: 'centos-binary-zaqar:latest'
     type: string
   DockerZaqarConfigImage:
     description: The container image to use for the zaqar config_volume
-    default: 'centos-binary-zaqar:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: zaqar
         puppet_tags: zaqar_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerZaqarConfigImage} ]
+        config_image: {get_param: DockerZaqarConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/zaqar.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -98,10 +89,7 @@ outputs:
       docker_config:
         step_4:
           zaqar:
-            image: &zaqar_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ]
+            image: &zaqar_image {get_param: DockerZaqarImage}
             net: host
             privileged: false
             restart: always