diff --git a/inventory/dev/group_vars/all.yml b/inventory/dev/group_vars/all.yml
index fb63f2c..59dd0d3 100644
--- a/inventory/dev/group_vars/all.yml
+++ b/inventory/dev/group_vars/all.yml
@@ -6,6 +6,7 @@ docker_install_compose_plugin: true
 
 use_helm: true
 use_krew: true
+use_kbcli: true
 kubectl_ver: v1.29.3
 kubectl_install_dir: /usr/bin
 krew_install_plugins:
diff --git a/inventory/test/group_vars/all.yml b/inventory/test/group_vars/all.yml
index df7d663..6b73556 100644
--- a/inventory/test/group_vars/all.yml
+++ b/inventory/test/group_vars/all.yml
@@ -3,6 +3,7 @@ docker_install_compose: true
 docker_install_compose_plugin: true
 
 use_helm: true
+use_kbcli: true
 use_krew: true
 kubectl_ver: v1.29.3
 kubectl_install_dir: /usr/bin
diff --git a/provision.yml b/provision.yml
index 51d76bd..72f5c04 100755
--- a/provision.yml
+++ b/provision.yml
@@ -78,27 +78,44 @@
 
   tasks:
     - name: Install Helm
-      when: use_helm | bool
+      when:
+        - use_helm is defined
+        - use_helm | bool
       ansible.builtin.include_role:
         name: andrewrothstein.kubernetes_helm
 
     - name: Install Krew
-      when: use_krew | bool
+      when:
+        - use_krew is defined
+        - use_krew | bool
       ansible.builtin.include_role:
         name: andrewrothstein.krew
 
+    - name: Install kbcli
+      when:
+        - use_kbcli is defined
+        - use_kbcli | bool
+      ansible.builtin.include_role:
+        name: bbaassssiiee.kubeblocks
+
     - name: Install OpenTofu
-      when: use_opentofu | bool
+      when:
+        - use_opentofu is defined
+        - use_opentofu | bool
       ansible.builtin.include_role:
         name: andrewrothstein.opentofu
 
     - name: Install Powershell
-      when: use_powershell | bool
+      when:
+        - use_powershell is defined
+        - use_powershell | bool
       ansible.builtin.include_role:
         name: andrewrothstein.powershell
 
     - name: Install Terraform
-      when: use_terraform | bool
+      when:
+        - use_terraform is defined
+        - use_terraform | bool
       ansible.builtin.include_role:
         name: andrewrothstein.terraform
 
diff --git a/roles/requirements.yml b/roles/requirements.yml
index 60321a0..186277e 100644
--- a/roles/requirements.yml
+++ b/roles/requirements.yml
@@ -1,9 +1,9 @@
 ---
 roles:
-  - src: andrewrothstein.kubernetes_helm
-    version: 3.0.17
   - src: andrewrothstein.krew
     version: v1.2.0
+  - src: andrewrothstein.kubernetes_helm
+    version: 3.0.17
   - src: andrewrothstein.opentofu
     version: 1.0.9
   - src: andrewrothstein.powershell
@@ -12,9 +12,11 @@ roles:
     version: v3.0.38
   - src: geerlingguy.docker
     version: 7.4.3
-  - src: bbaassssiiee.postgres_ssl
-    version: 1.1.0
+  - src: bbaassssiiee.kubeblocks
+    version: 1.0.0
   - src: bbaassssiiee.nginx_ssl
     version: 1.0.5
+  - src: bbaassssiiee.postgres_ssl
+    version: 1.1.0
   - src: bbaassssiiee.proxy
     version: 1.0.3
diff --git a/roles/semaphore/handlers/main.yml b/roles/semaphore/handlers/main.yml
index 09bfee5..62f0390 100644
--- a/roles/semaphore/handlers/main.yml
+++ b/roles/semaphore/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 # Only restart when not running in itself
 - name: Restart semaphore
-  when: not lookup('env', 'SEMAPHORE') 
+  when: not lookup('env', 'SEMAPHORE')
   ansible.builtin.systemd:
     name: semaphore
     state: restarted