diff --git a/ansible/playbooks/roles/rook/defaults/main.yml b/ansible/playbooks/roles/rook/defaults/main.yml
index eaf7c8d32a..415dfddfc4 100644
--- a/ansible/playbooks/roles/rook/defaults/main.yml
+++ b/ansible/playbooks/roles/rook/defaults/main.yml
@@ -2,6 +2,3 @@
 rook_helm_chart_file_name: rook-ceph-v1.8.1.tgz
 rook_chart_namespace: rook-ceph
 rook_helm_chart_name: rook-ceph
-rook_enabled: true
-kubeconfig:
-  remote: /etc/kubernetes/admin.conf
diff --git a/ansible/playbooks/roles/rook/tasks/main.yml b/ansible/playbooks/roles/rook/tasks/main.yml
index 3b90ab1464..74916b8f3d 100644
--- a/ansible/playbooks/roles/rook/tasks/main.yml
+++ b/ansible/playbooks/roles/rook/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
-- name: Prepare configuration and upgrade/install Helm chart
-  when: rook_enabled
+- name: Prepare configuration and upgrade/install Rook Helm chart
+  when: specification.enabled
   become: true
   run_once: true
 
diff --git a/schema/common/defaults/configuration/rook.yml b/schema/common/defaults/configuration/rook.yml
index c3ee7ec0f1..065cd567ab 100644
--- a/schema/common/defaults/configuration/rook.yml
+++ b/schema/common/defaults/configuration/rook.yml
@@ -2,4 +2,4 @@ kind: configuration/rook
 title: "Kubernetes Rook Config"
 name: default
 specification:
-    enabled: false
\ No newline at end of file
+    enabled: false
diff --git a/schema/common/validation/configuration/rook.yml b/schema/common/validation/configuration/rook.yml
index c802d5958a..59a51853d4 100644
--- a/schema/common/validation/configuration/rook.yml
+++ b/schema/common/validation/configuration/rook.yml
@@ -4,4 +4,4 @@ description: "Rook specification schema"
 type: object
 properties:
   enabled:
-    type: boolean
\ No newline at end of file
+    type: boolean