diff --git a/roles/clusterlust.kbcli/defaults/main.yml b/roles/clusterlust.kbcli/defaults/main.yml
index bf80153..1dbf63e 100644
--- a/roles/clusterlust.kbcli/defaults/main.yml
+++ b/roles/clusterlust.kbcli/defaults/main.yml
@@ -1,7 +1,9 @@
 # kbcli
-kbcli_releases_url: 'https://api.github.com/repos/apecloud/kbcli/releases/latest'
-kbcli_repo_url: 'https://github.com/apecloud/kbcli/releases/download'
-use_kbcli: true
 desired_state: present
+verify_state: true
+use_kbcli: true
 kbcli_download_package: true
+
+kbcli_releases_url: 'https://api.github.com/repos/apecloud/kbcli/releases/latest'
+kbcli_repo_url: 'https://github.com/apecloud/kbcli/releases/download'
 kbcli_path: /usr/local/bin
diff --git a/roles/clusterlust.kbcli/tasks/main.yml b/roles/clusterlust.kbcli/tasks/main.yml
index dfeedbb..1deef0b 100644
--- a/roles/clusterlust.kbcli/tasks/main.yml
+++ b/roles/clusterlust.kbcli/tasks/main.yml
@@ -2,3 +2,7 @@
 # desired_state in ['absent', 'present']
 - name: "Converge state - {{ desired_state }}"
   ansible.builtin.include_tasks: "{{ desired_state }}.yml"
+
+- name: "Verify state - {{ desired_state }}"
+  ansible.builtin.include_tasks: verify.yml
+  when: verify_state | bool
diff --git a/roles/clusterlust.kubeblocks/tasks/verify.yml b/roles/clusterlust.kbcli/tasks/verify.yml
similarity index 63%
rename from roles/clusterlust.kubeblocks/tasks/verify.yml
rename to roles/clusterlust.kbcli/tasks/verify.yml
index 5044474..ac1e183 100644
--- a/roles/clusterlust.kubeblocks/tasks/verify.yml
+++ b/roles/clusterlust.kbcli/tasks/verify.yml
@@ -1,8 +1,12 @@
 # Verify desired state, both absent and present can be verified.
 ---
-- name: "State variables - {{ desired_state }}"
+- name: "State variable - {{ desired_state }}"
   ansible.builtin.include_vars: "{{ desired_state }}.yml"
 
+- name: "Display {{ package_clause }}"
+  ansible.builtin.assert:
+    that: package_clause is defined
+
 - name: Gather package facts
   ansible.builtin.package_facts:
   no_log: true
@@ -11,4 +15,4 @@
   ansible.builtin.assert:
     quiet: true
     that:
-      - "'kbcli' {{ package_clause }} ansible_facts.packages"
+      - package_clause
diff --git a/roles/clusterlust.kbcli/vars/absent.yml b/roles/clusterlust.kbcli/vars/absent.yml
new file mode 100644
index 0000000..bbee368
--- /dev/null
+++ b/roles/clusterlust.kbcli/vars/absent.yml
@@ -0,0 +1,2 @@
+---
+package_clause: "'kbcli' not in ansible_facts.packages"
diff --git a/roles/clusterlust.kbcli/vars/present.yml b/roles/clusterlust.kbcli/vars/present.yml
new file mode 100644
index 0000000..27690d1
--- /dev/null
+++ b/roles/clusterlust.kbcli/vars/present.yml
@@ -0,0 +1,2 @@
+---
+package_clause: "'kbcli' in ansible_facts.packages"
diff --git a/roles/clusterlust.kubeblocks/defaults/main.yml b/roles/clusterlust.kubeblocks/defaults/main.yml
index b987248..b749c10 100644
--- a/roles/clusterlust.kubeblocks/defaults/main.yml
+++ b/roles/clusterlust.kubeblocks/defaults/main.yml
@@ -2,7 +2,6 @@
 # set true when k8s is up
 use_kubeblocks: false
 desired_state: present
-verify_state: true
 # Semaphore does not pass $HOME so path might need to be more explicit.
 k8s_auth_kubeconfig: "{{ lookup('env', 'HOME') }}/.kube/config"
 # KubeBlocks
diff --git a/roles/clusterlust.kubeblocks/tasks/main.yml b/roles/clusterlust.kubeblocks/tasks/main.yml
index 1deef0b..dfeedbb 100644
--- a/roles/clusterlust.kubeblocks/tasks/main.yml
+++ b/roles/clusterlust.kubeblocks/tasks/main.yml
@@ -2,7 +2,3 @@
 # desired_state in ['absent', 'present']
 - name: "Converge state - {{ desired_state }}"
   ansible.builtin.include_tasks: "{{ desired_state }}.yml"
-
-- name: "Verify state - {{ desired_state }}"
-  ansible.builtin.include_tasks: verify.yml
-  when: verify_state | bool
diff --git a/roles/clusterlust.kubeblocks/vars/absent.yml b/roles/clusterlust.kubeblocks/vars/absent.yml
deleted file mode 100644
index 4a4bf25..0000000
--- a/roles/clusterlust.kubeblocks/vars/absent.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-package_clause: 'not in'
diff --git a/roles/clusterlust.kubeblocks/vars/present.yml b/roles/clusterlust.kubeblocks/vars/present.yml
deleted file mode 100644
index 5be69e1..0000000
--- a/roles/clusterlust.kubeblocks/vars/present.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-package_clause: 'in'