diff --git a/roles/debian_hardening_physical_machine/tasks/main.yml b/roles/debian_hardening_physical_machine/tasks/main.yml
index b1ca1bb5c..25c17b03c 100644
--- a/roles/debian_hardening_physical_machine/tasks/main.yml
+++ b/roles/debian_hardening_physical_machine/tasks/main.yml
@@ -28,14 +28,18 @@
     owner: root
     group: root
     mode: '0440'
-  when: not revert
+  when:
+    - not revert
+    - cluster_ip_addr is defined
 
 - name: Adding ceph user to group privileged
   user:
     name: "ceph"
     groups: privileged
     append: yes
-  when: not revert
+  when:
+    - not revert
+    - cluster_ip_addr is defined
 
 - name: Adding Debian-snmp user to group privileged
   user:
diff --git a/roles/deploy_cukinia_tests/cukinia-tests b/roles/deploy_cukinia_tests/cukinia-tests
index df5fa07fc..436532cc6 160000
--- a/roles/deploy_cukinia_tests/cukinia-tests
+++ b/roles/deploy_cukinia_tests/cukinia-tests
@@ -1 +1 @@
-Subproject commit df5fa07fcc5f8e340a508d798a5dc72792cefd38
+Subproject commit 436532cc693c2661e705887198df3775bec713bb