diff --git a/roles/pve-subscribe/defaults/main.yml b/roles/pve-subscribe/defaults/main.yml
new file mode 100644
index 0000000..8631920
--- /dev/null
+++ b/roles/pve-subscribe/defaults/main.yml
@@ -0,0 +1 @@
+pve_subscription_key: Null
diff --git a/roles/pve-subscribe/tasks/main.yml b/roles/pve-subscribe/tasks/main.yml
index 625917f..4c09dd7 100644
--- a/roles/pve-subscribe/tasks/main.yml
+++ b/roles/pve-subscribe/tasks/main.yml
@@ -6,8 +6,8 @@
 
 - name: Configuring pve for unsubscribed operation
   import_tasks: no-subscription.yml
-  when: pve_enterprise | default(False) != True
+  when: pve_subscription_key | length == 0
 
 - name: Configuring pve for licensed operation
   import_tasks: enterprise.yml
-  when: pve_enterprise | default(False) == True
+  when: pve_subscription_key | length != 0