diff --git a/ansible/roles/csi/defaults/main.yml b/ansible/roles/csi/defaults/main.yml
index 8316159..5142831 100644
--- a/ansible/roles/csi/defaults/main.yml
+++ b/ansible/roles/csi/defaults/main.yml
@@ -7,7 +7,8 @@ csi_rollout_retries: 8
 csi_rollout_delay_seconds: 5
 csi_failure_log_tail_lines: 120
 csi_smoke_test_enabled: true
-csi_smoke_test_storage_class: "hcloud-volumes"
+csi_smoke_test_storage_class: "csi-smoke-hcloud-immediate"
+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
diff --git a/ansible/roles/csi/tasks/main.yml b/ansible/roles/csi/tasks/main.yml
index 43f56c6..bed56b2 100644
--- a/ansible/roles/csi/tasks/main.yml
+++ b/ansible/roles/csi/tasks/main.yml
@@ -148,6 +148,15 @@
 - name: Apply CSI smoke test resources
   shell: |
     kubectl apply -f - <<'EOF'
+    apiVersion: storage.k8s.io/v1
+    kind: StorageClass
+    metadata:
+      name: {{ csi_smoke_test_storage_class }}
+    provisioner: csi.hetzner.cloud
+    reclaimPolicy: Delete
+    volumeBindingMode: Immediate
+    allowVolumeExpansion: true
+    ---
     apiVersion: v1
     kind: PersistentVolumeClaim
     metadata:
@@ -304,7 +313,9 @@
     - csi_smoke_pvc_wait.rc != 0 or (csi_smoke_job_wait.rc | default(1)) != 0
 
 - name: Cleanup CSI smoke test resources
-  command: kubectl -n kube-system delete job csi-smoke-job pvc csi-smoke-pvc --ignore-not-found
+  shell: |
+    kubectl -n kube-system delete job csi-smoke-job pvc csi-smoke-pvc --ignore-not-found
+    kubectl delete storageclass {{ csi_smoke_test_storage_class }} --ignore-not-found
   failed_when: false
   changed_when: false
   when: csi_smoke_test_enabled | bool