diff --git a/roles/kubernetes-apps/registry/tasks/main.yml b/roles/kubernetes-apps/registry/tasks/main.yml
index fd8cb82e33d7123d50efbd89dcb214d26ee1dbe4..05f8f470320bbd95d796ff2f89b28f3b9af0fd2a 100644
--- a/roles/kubernetes-apps/registry/tasks/main.yml
+++ b/roles/kubernetes-apps/registry/tasks/main.yml
@@ -59,8 +59,8 @@
     - { name: registry-pvc, file: registry-pvc.yml, type: pvc }
   register: registry_manifests
   when:
-    - registry_storage_class != none
-    - registry_disk_size != none
+    - registry_storage_class != none and registry_storage_class != ""
+    - registry_disk_size != none and registry_disk_size != ""
     - inventory_hostname == groups['kube-master'][0]
 
 - name: Registry | Apply PVC manifests
@@ -73,6 +73,6 @@
     state: "latest"
   with_items: "{{ registry_manifests.results }}"
   when:
-    - registry_storage_class != none
-    - registry_disk_size != none
+    - registry_storage_class != none and registry_storage_class != ""
+    - registry_disk_size != none and registry_disk_size != ""
     - inventory_hostname == groups['kube-master'][0]