diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index f664cf6d5a..bb4f69563a 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -590,17 +590,23 @@ outputs:
                         bridge_name: "{{ neutron_physical_bridge_name }}"
                         interface_name: "{{ neutron_public_interface_name }}"
                       register: NetworkConfig_result
+                      when:
+                        - not ansible_check_mode
                       failed_when: NetworkConfig_result.rc is not defined
 
                     - name: Write rc of NetworkConfig script
                       copy:
                         content: "{{ NetworkConfig_result.rc }}"
                         dest: /var/lib/tripleo-config/os-net-config.returncode
+                      when:
+                        - NetworkConfig_result.rc is defined
 
                     - name: NetworkConfig stdout
                       debug:
                         var: NetworkConfig_result.stderr_lines
                       failed_when: NetworkConfig_result.rc != 0
+                      when:
+                        - NetworkConfig_result.rc is defined
 
                     # os-net-config currently relies on the legacy network
                     # so we need to ensure it's enabled on boot. This should