diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml
index f56819506b..da54941454 100644
--- a/deployment/cinder/cinder-backup-container-puppet.yaml
+++ b/deployment/cinder/cinder-backup-container-puppet.yaml
@@ -232,7 +232,7 @@ outputs:
         config_image: {get_param: ContainerCinderConfigImage}
       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
+          command: /usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf
           config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]}
           permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]}
       docker_config:
diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
index ec43bf74bd..9713cd1897 100644
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@@ -150,7 +150,7 @@ outputs:
         config_image: {get_param: ContainerCinderConfigImage}
       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
+          command: /usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf
           config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]}
           permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]}
       container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml
index 486551be87..8908655c54 100644
--- a/deployment/cinder/cinder-scheduler-container-puppet.yaml
+++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml
@@ -88,7 +88,7 @@ outputs:
         config_image: {get_param: ContainerCinderConfigImage}
       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
+          command: /usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml
index c1730f6e37..3170100884 100644
--- a/deployment/cinder/cinder-volume-container-puppet.yaml
+++ b/deployment/cinder/cinder-volume-container-puppet.yaml
@@ -301,7 +301,7 @@ outputs:
         config_image: {get_param: ContainerCinderConfigImage}
       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
+          command: /usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf
           config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]}
           permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]}
       docker_config:
diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
index bff391e202..92266d3311 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -106,7 +106,7 @@ outputs:
           - tripleo::profile::base::lvm::enable_udev: false
             tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image: &cinder_volume_image_pcmklatest
               if:
-                - {get_param: ClusterFullTag} 
+                - {get_param: ClusterFullTag}
                 - "cluster.common.tag/cinder-volume:pcmklatest"
                 - yaql:
                     data:
@@ -139,7 +139,7 @@ outputs:
         config_image: {get_param: ContainerCinderConfigImage}
       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
+          command: /usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf
           config_files: {get_attr: [CinderCommon, cinder_common_kolla_config_files]}
           permissions: {get_attr: [CinderCommon, cinder_common_kolla_permissions]}
       container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index 2e17b8e328..a2c0834734 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -449,7 +449,11 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [TLSProxyBase, role_data, config_settings]
-          - glance::api::db::database_connection:
+            # Set this for glance as it does not have a default
+          - glance::config::api_config:
+              paste_deploy/config_file:
+                value: '/etc/glance/glance-api-paste.ini'
+            glance::api::db::database_connection:
               make_url:
                 scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
                 username: glance
@@ -628,7 +632,7 @@ outputs:
         config_image: {get_param: ContainerGlanceApiConfigImage}
       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 --config-file /etc/glance/glance-image-import.conf
+          command: /usr/bin/glance-api --config-file /etc/glance/glance-api.conf --config-file /etc/glance/glance-image-import.conf
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml
index fb79703f94..07b10e881d 100644
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@@ -220,7 +220,7 @@ outputs:
           command:
             list_join:
             - ' '
-            - - /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
+            - - /usr/bin/heat-engine --config-file /etc/heat/heat.conf
               - get_attr: [HeatEngineLogging, cmd_extra_args]
           config_files: &heat_engine_config_files
             - source: "/var/lib/kolla/config_files/src/*"
diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml
index 9a2a8cc0ec..dc1e6cc933 100644
--- a/deployment/ironic/ironic-inspector-container-puppet.yaml
+++ b/deployment/ironic/ironic-inspector-container-puppet.yaml
@@ -400,7 +400,7 @@ outputs:
           - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:z
       kolla_config:
         /var/lib/kolla/config_files/ironic_inspector.json:
-          command: /usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector-dist.conf --config-file /etc/ironic-inspector/inspector.conf
+          command: /usr/bin/ironic-inspector  --config-file /etc/ironic-inspector/inspector.conf
           config_files: &ironic_inspector_config_files
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml
index 92f4fc2c3c..7c25dba77f 100644
--- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml
+++ b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml
@@ -112,7 +112,7 @@ outputs:
         config_image: {get_param: ContainerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ironic_neutron_agent.json:
-          command: /usr/bin/ironic-neutron-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ironic_neutron_agent.ini --config-dir /etc/neutron/conf.d/common
+          command: /usr/bin/ironic-neutron-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ironic_neutron_agent.ini --config-dir /etc/neutron/conf.d/common
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml
index c6e6e1fa5c..fef4374f12 100644
--- a/deployment/manila/manila-scheduler-container-puppet.yaml
+++ b/deployment/manila/manila-scheduler-container-puppet.yaml
@@ -71,7 +71,7 @@ outputs:
         config_image: {get_param: ContainerManilaConfigImage}
       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
+          command: /usr/bin/manila-scheduler --config-file /etc/manila/manila.conf
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml
index 95a9e710d3..dc757736a6 100644
--- a/deployment/manila/manila-share-container-puppet.yaml
+++ b/deployment/manila/manila-share-container-puppet.yaml
@@ -140,7 +140,7 @@ outputs:
         config_image: {get_param: ContainerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_share.json:
-          command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
+          command: /usr/bin/manila-share --config-file /etc/manila/manila.conf
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml
index aeae921d3a..5f9dbb6bf7 100644
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/deployment/manila/manila-share-pacemaker-puppet.yaml
@@ -129,7 +129,7 @@ outputs:
         config_image: {get_param: ContainerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_share.json:
-          command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
+          command: /usr/bin/manila-share --config-file /etc/manila/manila.conf
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml
index 84415c7c0c..d682be31ba 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -446,7 +446,7 @@ outputs:
           command:
             list_join:
             - ' '
-            - - /usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/server --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
+            - - /usr/bin/neutron-server --config-dir /usr/share/neutron/server --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
               - get_attr: [NeutronLogging, cmd_extra_args]
           config_files: &neutron_api_config_files
             - source: "/var/lib/kolla/config_files/src/*"
diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
index 436bee1df3..333732daf2 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -257,7 +257,7 @@ outputs:
           command:
             list_join:
             - ' '
-            - - /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 --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent
+            - - /usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent
               - get_attr: [NeutronLogging, cmd_extra_args]
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml
index 89563553f5..ebfae66281 100644
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@@ -226,7 +226,7 @@ outputs:
           command:
             list_join:
               - ' '
-              - - /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
+              - - /usr/bin/neutron-l3-agent --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
                 - get_attr: [NeutronLogging, cmd_extra_args]
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml
index c2cb150087..7398c6fd8d 100644
--- a/deployment/neutron/neutron-metadata-container-puppet.yaml
+++ b/deployment/neutron/neutron-metadata-container-puppet.yaml
@@ -143,7 +143,7 @@ outputs:
           command:
             list_join:
               - ' '
-              - - /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
+              - - /usr/bin/neutron-metadata-agent --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
                 - get_attr: [NeutronLogging, cmd_extra_args]
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
index 0d984ad219..758dcbb9e1 100644
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -282,7 +282,6 @@ outputs:
                 #!/bin/bash
                 set -xe
                 PYTHON -m neutron.cmd.destroy_patch_ports \
-                --config-file /usr/share/neutron/neutron-dist.conf \
                 --config-file /etc/neutron/neutron.conf \
                 --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \
                 --config-dir /etc/neutron/conf.d/common \
@@ -290,7 +289,6 @@ outputs:
                 --log-file=/var/log/neutron/openvswitch-agent.log
 
                 /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-dir /etc/neutron/conf.d/common \
diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml
index 4778985cb2..a655be2694 100644
--- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml
@@ -152,7 +152,7 @@ outputs:
           command:
             list_join:
             - ' '
-            - - /usr/bin/neutron-sriov-nic-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/sriov_agent.ini --config-dir /etc/neutron/conf.d/common
+            - - /usr/bin/neutron-sriov-nic-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/sriov_agent.ini --config-dir /etc/neutron/conf.d/common
               - get_attr: [NeutronLogging, cmd_extra_args]
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml
index 8039d566f9..866cf19d10 100644
--- a/deployment/octavia/octavia-api-container-puppet.yaml
+++ b/deployment/octavia/octavia-api-container-puppet.yaml
@@ -262,7 +262,7 @@ outputs:
                   recurse: true
               - {get_attr: [OctaviaProviderConfig, role_data, kolla_permissions]}
         /var/lib/kolla/config_files/octavia_driver_agent.json:
-          command: /usr/bin/octavia-driver-agent --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/driver-agent.log --config-dir /etc/octavia/conf.d/common
+          command: /usr/bin/octavia-driver-agent --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/driver-agent.log --config-dir /etc/octavia/conf.d/common
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml
index fff721d986..cf82b90a9b 100644
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@@ -112,7 +112,7 @@ outputs:
         config_image: {get_param: ContainerOctaviaConfigImage}
       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 --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/octavia-health-manager
+          command: /usr/bin/octavia-health-manager --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/octavia-health-manager
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
index 1ff9b63341..66a1844e95 100644
--- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml
+++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
@@ -97,7 +97,7 @@ outputs:
         config_image: {get_param: ContainerOctaviaConfigImage}
       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 --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/octavia-housekeeping
+          command: /usr/bin/octavia-housekeeping --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/octavia-housekeeping
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml
index 29ec1c7a10..faccf5976f 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -86,7 +86,7 @@ outputs:
         config_image: {get_param: ContainerOctaviaConfigImage}
       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 --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/octavia-worker
+          command: /usr/bin/octavia-worker --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/octavia-worker
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"