diff --git a/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml b/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml
index cb0ff39079..a69ff3f8a6 100644
--- a/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml
+++ b/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml
@@ -25,14 +25,24 @@
           dest: "/etc/openstack_deploy.NEWTON/"
           force: no
 
+      - name: Retrieve differences
+        shell: rsync -avun "{{ repo_root_dir }}/playbooks/inventory/env.d/" "/etc/openstack_deploy/env.d/" | grep "yml$"
+        ignore_errors: yes
+        register: diff_result
+
       - name: Copy new env.d files into place
         copy:
-            src: "{{ repo_root_dir }}/etc/openstack_deploy/env.d/{{ item }}.yml"
-            dest: "/etc/openstack_deploy/env.d/{{ item }}.yml"
+            src: "{{ repo_root_dir }}/playbooks/inventory/env.d/{{ item }}"
+            dest: "/etc/openstack_deploy/env.d/{{ item }}"
             force: no
         with_items:
-            - ironic
-
+            - "{{ diff_result.stdout_lines }}"
+        when: diff_result.stdout != ""
+    
+      - name: Check result for emptiness
+        debug: msg="All new env.d files are placed in the stock repo. No new changes"
+        when: diff_result.stdout == ""
+      
       - name: Update OpenStack variable names
         command: "{{ upgrade_scripts }}/migrate_openstack_vars.py {{ item }} {{ (item | basename)[:-4] }}"
         args: