diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 0311de1..3335f25 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -230,6 +230,15 @@ jobs:
         env:
           ANSIBLE_HOST_KEY_CHECKING: "False"
 
+      - name: Post-deploy cluster health checks
+        working-directory: ansible
+        run: |
+          ansible -i inventory.ini 'control_plane[0]' -m command -a "kubectl get nodes -o wide"
+          ansible -i inventory.ini 'control_plane[0]' -m command -a "kubectl -n kube-system get pods -o wide"
+          ansible -i inventory.ini 'control_plane[0]' -m command -a "kubectl get storageclass"
+        env:
+          ANSIBLE_HOST_KEY_CHECKING: "False"
+
       - name: Upload Kubeconfig
         uses: actions/upload-artifact@v3
         with:
diff --git a/ansible/roles/csi/defaults/main.yml b/ansible/roles/csi/defaults/main.yml
index 8a4ddbe..bd9cedb 100644
--- a/ansible/roles/csi/defaults/main.yml
+++ b/ansible/roles/csi/defaults/main.yml
@@ -12,4 +12,4 @@ csi_smoke_test_base_storage_class: "hcloud-volumes"
 csi_smoke_test_size: "1Gi"
 csi_smoke_test_pvc_timeout_seconds: 300
 csi_smoke_test_job_timeout_seconds: 300
-csi_smoke_test_required: false
+csi_smoke_test_required: true