diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index 60a78d7984..e823f44242 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -244,11 +244,11 @@
             force: yes
             mode: "{{ item[1].mode | default('0600', true) }}"
             setype: svirt_sandbox_file_t
-          loop: "{{ role_data_docker_config_scripts | dictsort }}"
+          loop: "{{ role_data_container_config_scripts | dictsort }}"
           loop_control:
             label: "{{ item[0] }}"
           vars:
-            role_data_docker_config_scripts: "{{ lookup('file', tripleo_role_name + '/docker_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}"
+            role_data_container_config_scripts: "{{ lookup('file', tripleo_role_name + '/container_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}"
           tags:
             - container_config_scripts
 
diff --git a/common/services.yaml b/common/services.yaml
index d945323249..e092ecdf13 100644
--- a/common/services.yaml
+++ b/common/services.yaml
@@ -102,11 +102,11 @@ resources:
       value:
         yaql:
           expression:
-            # select 'docker_config_scripts' only from services that have it
-            coalesce($.data.service_names, []).zip(coalesce($.data.docker_config_scripts, [])).where($[1] != null).select($[1]).reduce($1.mergeWith($2), {})
+            # select 'container_config_scripts' only from services that have it
+            coalesce($.data.service_names, []).zip(coalesce($.data.container_config_scripts, [])).where($[1] != null).select($[1]).reduce($1.mergeWith($2), {})
           data:
             service_names: {get_attr: [ServiceChain, role_data, service_names]}
-            docker_config_scripts: {get_attr: [ServiceChain, role_data, docker_config_scripts]}
+            container_config_scripts: {get_attr: [ServiceChain, role_data, container_config_scripts]}
 
   MonitoringSubscriptionsConfig:
     type: OS::Heat::Value
@@ -368,7 +368,7 @@ outputs:
       puppet_config: {get_attr: [PuppetConfig, value]}
       kolla_config: {get_attr: [KollaConfig, value]}
       docker_config: {get_attr: [DockerConfig, value]}
-      docker_config_scripts: {get_attr: [DockerConfigScripts, value]}
+      container_config_scripts: {get_attr: [DockerConfigScripts, value]}
       container_puppet_tasks:
         map_merge:
           - {get_attr: [ContainerPuppetTasks, value]}
diff --git a/docker_config_scripts/__init__.py b/container_config_scripts/__init__.py
similarity index 100%
rename from docker_config_scripts/__init__.py
rename to container_config_scripts/__init__.py
diff --git a/docker_config_scripts/nova_cell_v2_discover_host.py b/container_config_scripts/nova_cell_v2_discover_host.py
similarity index 100%
rename from docker_config_scripts/nova_cell_v2_discover_host.py
rename to container_config_scripts/nova_cell_v2_discover_host.py
diff --git a/docker_config_scripts/nova_statedir_ownership.py b/container_config_scripts/nova_statedir_ownership.py
similarity index 100%
rename from docker_config_scripts/nova_statedir_ownership.py
rename to container_config_scripts/nova_statedir_ownership.py
diff --git a/docker_config_scripts/nova_wait_for_placement_service.py b/container_config_scripts/nova_wait_for_placement_service.py
similarity index 100%
rename from docker_config_scripts/nova_wait_for_placement_service.py
rename to container_config_scripts/nova_wait_for_placement_service.py
diff --git a/docker_config_scripts/pyshim.sh b/container_config_scripts/pyshim.sh
similarity index 100%
rename from docker_config_scripts/pyshim.sh
rename to container_config_scripts/pyshim.sh
diff --git a/docker_config_scripts/tests/__init__.py b/container_config_scripts/tests/__init__.py
similarity index 100%
rename from docker_config_scripts/tests/__init__.py
rename to container_config_scripts/tests/__init__.py
diff --git a/docker_config_scripts/tests/test_nova_statedir_ownership.py b/container_config_scripts/tests/test_nova_statedir_ownership.py
similarity index 98%
rename from docker_config_scripts/tests/test_nova_statedir_ownership.py
rename to container_config_scripts/tests/test_nova_statedir_ownership.py
index 66d4767869..664f5d8481 100644
--- a/docker_config_scripts/tests/test_nova_statedir_ownership.py
+++ b/container_config_scripts/tests/test_nova_statedir_ownership.py
@@ -20,9 +20,9 @@ import stat
 
 from oslotest import base
 
-from docker_config_scripts.nova_statedir_ownership import \
+from container_config_scripts.nova_statedir_ownership import \
     NovaStatedirOwnershipManager
-from docker_config_scripts.nova_statedir_ownership import PathManager
+from container_config_scripts.nova_statedir_ownership import PathManager
 
 # Real chown would require root, so in order to test this we need to fake
 # all of the methods that interact with the filesystem
diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
index 6245ccffc7..fd3969171a 100644
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@@ -165,7 +165,7 @@ outputs:
             - path: /var/log/cinder
               owner: cinder:cinder
               recurse: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_3:
           cinder_backup_init_logs:
diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
index 405279686a..52f37d7a04 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -149,7 +149,7 @@ outputs:
             - path: /var/log/cinder
               owner: cinder:cinder
               recurse: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_3:
           cinder_volume_init_logs:
diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml
index 71f47c9cf4..44a92ce33a 100644
--- a/deployment/database/mysql-pacemaker-puppet.yaml
+++ b/deployment/database/mysql-pacemaker-puppet.yaml
@@ -198,7 +198,7 @@ outputs:
               owner: mysql:mysql
               perm: '0600'
               optional: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_1:
           mysql_data_ownership:
diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml
index 0928a33131..3b0dd78d9c 100644
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@@ -205,7 +205,7 @@ outputs:
               owner: root:root
               perm: '0600'
               optional: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_2:
           map_merge:
diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml
index 702fe618ed..eb9fee6ed5 100644
--- a/deployment/haproxy/haproxy-container-puppet.yaml
+++ b/deployment/haproxy/haproxy-container-puppet.yaml
@@ -241,7 +241,7 @@ outputs:
               owner: haproxy:haproxy
               recurse: true
               optional: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_1:
           map_merge:
diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
index a7732941f4..931158bb86 100644
--- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml
+++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
@@ -225,7 +225,7 @@ outputs:
               owner: haproxy:haproxy
               perm: '0600'
               optional: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_2:
           haproxy_restart_bundle:
diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml
index c59a99ad7d..bdf70c0444 100644
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@@ -453,7 +453,7 @@ outputs:
             - path: /var/log/ironic
               owner: ironic:ironic
               recurse: true
-      docker_config_scripts:
+      container_config_scripts:
         create_swift_temp_url_key.sh:
           mode: "0700"
           content: |
diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml
index f7e1faaf66..822ed66c66 100644
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/deployment/manila/manila-share-pacemaker-puppet.yaml
@@ -130,7 +130,7 @@ outputs:
             - path: /var/log/manila
               owner: manila:manila
               recurse: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_3:
           manila_share_init_logs:
diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
index 2dc074d251..6085019ff1 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -266,7 +266,7 @@ outputs:
               owner: neutron:neutron
             - path: /etc/pki/tls/private/neutron.key
               owner: neutron:neutron
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_2:
           create_dnsmasq_wrapper:
diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml
index 5e0026ae23..d78ba4cb18 100644
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@@ -235,7 +235,7 @@ outputs:
             - path: /var/lib/neutron
               owner: neutron:neutron
               recurse: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_2:
           create_keepalived_wrapper:
diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
index 27bcefe3cc..08c033796d 100644
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -239,7 +239,7 @@ outputs:
             - path: /var/log/neutron
               owner: neutron:neutron
               recurse: true
-      docker_config_scripts:
+      container_config_scripts:
         neutron_ovs_agent_launcher.sh:
           mode: "0755"
           content:
diff --git a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
index ab51fcc7f2..6ad47e6f14 100644
--- a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
@@ -143,8 +143,8 @@ outputs:
           - /run/openvswitch:/run/openvswitch
       kolla_config:
         get_attr: [NeutronOvsAgent, role_data, kolla_config]
-      docker_config_scripts:
-        get_attr: [NeutronOvsAgent, role_data, docker_config_scripts]
+      container_config_scripts:
+        get_attr: [NeutronOvsAgent, role_data, container_config_scripts]
       docker_config:
         get_attr: [NeutronOvsAgent, role_data, docker_config]
       metadata_settings:
diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index fca523249e..2358bbc823 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -307,7 +307,7 @@ outputs:
             - path: /var/log/nova
               owner: nova:nova
               recurse: true
-      docker_config_scripts:
+      container_config_scripts:
         nova_api_ensure_default_cell.sh:
           mode: "0700"
           content:
diff --git a/deployment/nova/nova-compute-common-container-puppet.yaml b/deployment/nova/nova-compute-common-container-puppet.yaml
index 7e7541dd67..669a99f2e5 100644
--- a/deployment/nova/nova-compute-common-container-puppet.yaml
+++ b/deployment/nova/nova-compute-common-container-puppet.yaml
@@ -34,15 +34,15 @@ parameters:
     type: json
 
 outputs:
-  docker_config_scripts:
+  container_config_scripts:
     description: Shared docker config scripts
     value:
       nova_statedir_ownership.py:
         mode: "0700"
-        content: { get_file: ../../docker_config_scripts/nova_statedir_ownership.py }
+        content: { get_file: ../../container_config_scripts/nova_statedir_ownership.py }
       nova_wait_for_placement_service.py:
         mode: "0700"
-        content: { get_file: ../../docker_config_scripts/nova_wait_for_placement_service.py }
+        content: { get_file: ../../container_config_scripts/nova_wait_for_placement_service.py }
       nova_cell_v2_discover_host.py:
         mode: "0700"
-        content: { get_file: ../../docker_config_scripts/nova_cell_v2_discover_host.py }
+        content: { get_file: ../../container_config_scripts/nova_cell_v2_discover_host.py }
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 2ee85e626c..38dacb5ed8 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -479,10 +479,10 @@ outputs:
                     USER: {get_param: CephClientUserName}
               owner: nova:nova
               perm: '0600'
-      docker_config_scripts:
+      container_config_scripts:
         map_merge:
-          - {get_attr: [ContainersCommon, docker_config_scripts]}
-          - {get_attr: [NovaComputeCommon, docker_config_scripts]}
+          - {get_attr: [ContainersCommon, container_config_scripts]}
+          - {get_attr: [NovaComputeCommon, container_config_scripts]}
       docker_config:
         step_3:
           nova_statedir_owner:
diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml
index 394b6f99a3..7ada988d60 100644
--- a/deployment/nova/nova-ironic-container-puppet.yaml
+++ b/deployment/nova/nova-ironic-container-puppet.yaml
@@ -115,10 +115,10 @@ outputs:
             - path: /var/log/nova
               owner: nova:nova
               recurse: true
-      docker_config_scripts:
+      container_config_scripts:
         map_merge:
-          - {get_attr: [ContainersCommon, docker_config_scripts]}
-          - {get_attr: [NovaComputeCommon, docker_config_scripts]}
+          - {get_attr: [ContainersCommon, container_config_scripts]}
+          - {get_attr: [NovaComputeCommon, container_config_scripts]}
       docker_config:
         step_3:
           nova_statedir_owner:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
index 6ab8768931..ed0da12645 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@@ -155,7 +155,7 @@ outputs:
              optional: true
       # When using pacemaker we don't launch the container, instead that is done by pacemaker
       # itself.
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_1:
           rabbitmq_bootstrap:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index 6d41f4517a..e2289b3e26 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -155,7 +155,7 @@ outputs:
              optional: true
       # When using pacemaker we don't launch the container, instead that is done by pacemaker
       # itself.
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_1:
           rabbitmq_bootstrap:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index b79a025240..a283ac785c 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -155,7 +155,7 @@ outputs:
              optional: true
       # When using pacemaker we don't launch the container, instead that is done by pacemaker
       # itself.
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_1:
           rabbitmq_bootstrap:
diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml
index 8d94e2c647..736eb6f511 100644
--- a/deployment/swift/swift-proxy-container-puppet.yaml
+++ b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -316,7 +316,7 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
-      docker_config_scripts:
+      container_config_scripts:
         create_swift_secret.sh:
           mode: "0700"
           content: |
diff --git a/docker/services/containers-common.yaml b/docker/services/containers-common.yaml
index 9032d7bc35..9289dc972d 100644
--- a/docker/services/containers-common.yaml
+++ b/docker/services/containers-common.yaml
@@ -48,7 +48,7 @@ conditions:
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
 
 outputs:
-  docker_config_scripts:
+  container_config_scripts:
     description: Shared docker config scripts
     value:
       docker_puppet_apply.sh:
@@ -85,7 +85,7 @@ outputs:
           exit $rc
       pyshim.sh:
         mode: "0700"
-        content: { get_file: ../../docker_config_scripts/pyshim.sh }
+        content: { get_file: ../../container_config_scripts/pyshim.sh }
 
   volumes_base:
     description: Base volume list
@@ -120,7 +120,7 @@ outputs:
           - /etc/puppet:/etc/puppet:ro
 
   docker_puppet_apply_volumes:
-    description: Common volumes needed to run the docker_puppet_apply.sh from docker_config_scripts
+    description: Common volumes needed to run the docker_puppet_apply.sh from container_config_scripts
     value:
       list_concat:
         - *volumes_base
diff --git a/docker/services/ovn-metadata.yaml b/docker/services/ovn-metadata.yaml
index dc32c0165a..48d93da763 100644
--- a/docker/services/ovn-metadata.yaml
+++ b/docker/services/ovn-metadata.yaml
@@ -131,7 +131,7 @@ outputs:
             - path: /var/lib/neutron
               owner: neutron:neutron
               recurse: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_2:
           create_haproxy_wrapper:
diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml
index 3162a457d1..e1d052793f 100644
--- a/docker/services/pacemaker/ovn-dbs.yaml
+++ b/docker/services/pacemaker/ovn-dbs.yaml
@@ -124,7 +124,7 @@ outputs:
               merge: true
               preserve_properties: true
               optional: true
-      docker_config_scripts: {get_attr: [ContainersCommon, docker_config_scripts]}
+      container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       docker_config:
         step_3:
           ovn_dbs_restart_bundle:
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 2f5e187aba..b1b172be09 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -65,7 +65,7 @@ OPTIONAL_DOCKER_SECTIONS = ['container_puppet_tasks', 'upgrade_tasks',
                             'host_prep_tasks', 'metadata_settings',
                             'kolla_config', 'global_config_settings',
                             'external_deploy_tasks', 'external_post_deploy_tasks',
-                            'docker_config_scripts', 'step_config',
+                            'container_config_scripts', 'step_config',
                             'monitoring_subscription',
                             'external_update_tasks', 'external_upgrade_tasks']
 # ansible tasks cannot be an empty dict or ansible is unhappy
diff --git a/tox.ini b/tox.ini
index eafdc305bd..6c901760ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,11 +26,11 @@ commands =
     python ./tools/yaml-validate.py .
     bash -c ./tools/roles-data-validation.sh
     bash -c ./tools/check-up-to-date.sh
-    flake8 ./docker_config_scripts/
+    flake8 ./container_config_scripts/
 
 [testenv:flake8]
 commands =
-    flake8 ./docker_config_scripts/
+    flake8 ./container_config_scripts/
 
 [testenv:templates]
 basepython = python3