diff --git a/roles/overcloud-prep-containers/defaults/main.yml b/roles/overcloud-prep-containers/defaults/main.yml
index ec9d09e6f..7d253e6e4 100644
--- a/roles/overcloud-prep-containers/defaults/main.yml
+++ b/roles/overcloud-prep-containers/defaults/main.yml
@@ -1,9 +1,9 @@
 ---
-
 tripleo_common_dir: /usr/share/openstack-tripleo-common
 containerized_overcloud: false
-overcloud_prep_containers_script: overcloud-prep-containers.sh.j2
-overcloud_prep_containers_log: overcloud_prep_containers.log
+overcloud_prep_containers_template: overcloud-prep-containers.sh.j2
+overcloud_prep_containers_script: "overcloud-prep-containers.sh"
+overcloud_prep_containers_log: "overcloud_prep_containers.log"
 prepare_service_env_args: -e {{ overcloud_templates_path }}/environments/docker.yaml
 update_containers: false
 container_process_count: 8
diff --git a/roles/overcloud-prep-containers/tasks/create-scripts.yml b/roles/overcloud-prep-containers/tasks/create-scripts.yml
index d7adacc15..8e9b81573 100644
--- a/roles/overcloud-prep-containers/tasks/create-scripts.yml
+++ b/roles/overcloud-prep-containers/tasks/create-scripts.yml
@@ -9,6 +9,6 @@
 
 - name: Create overcloud prep-containers script
   template:
-    src: "{{ overcloud_prep_containers_script }}"
-    dest: "{{ working_dir }}/overcloud-prep-containers.sh"
+    src: "{{ overcloud_prep_containers_template }}"
+    dest: "{{ working_dir }}/{{ overcloud_prep_containers_script }}"
     mode: 0755
diff --git a/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml b/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml
index f1ed69818..5f502a76b 100644
--- a/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml
+++ b/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml
@@ -28,6 +28,6 @@
 - name: Prepare for the containerized deployment
   shell: >
     set -o pipefail &&
-    {{ working_dir }}/overcloud-prep-containers.sh 2>&1 {{ timestamper_cmd }} >
+    {{ working_dir }}/{{ overcloud_prep_containers_script }} 2>&1 {{ timestamper_cmd }} >
     {{ overcloud_prep_containers_log }}
   when: containerized_overcloud|bool