diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
index 7fdfae74d1..3a062bd451 100644
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -384,6 +384,7 @@ outputs:
                 service:
                   name: neutron-cleanup
                   enabled: true
+                when: not (ansible_check_mode|bool)
               - name: enable virt_sandbox_use_netlink for healthcheck
                 seboolean:
                   name: virt_sandbox_use_netlink
diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml
index adfbe67cc7..1e24e21803 100644
--- a/deployment/ovn/ovn-controller-container-puppet.yaml
+++ b/deployment/ovn/ovn-controller-container-puppet.yaml
@@ -451,6 +451,7 @@ outputs:
           service:
             name: neutron-cleanup
             enabled: true
+          when: not (ansible_check_mode|bool)
       external_deploy_tasks:
         - when:
             - step|int == 0