diff --git a/roles/base/tasks/core.yml b/roles/base/tasks/core.yml
index 1f64694..947ca8c 100644
--- a/roles/base/tasks/core.yml
+++ b/roles/base/tasks/core.yml
@@ -19,13 +19,13 @@
   tags:
   - always
 
-- name: Attach subscription
+- name: Attach RHEL subscription
   redhat_subscription:
     state: present
     activationkey: "{{ base_redhat_subscription_activationkey }}"
     org_id: "{{ base_redhat_subscription_org_id }}"
     pool: '^(Red Hat Enterprise Server|Red Hat Virtualization)$'
-  when: ansible_distribution == 'RedHat' and base_redhat_subscription_org_id != "" and base_redhat_subscription_activationkey != ""
+  when: ansible_distribution == 'RedHat' and (base_redhat_subscription_org_id != "" and base_redhat_subscription_activationkey != "")
 
 - name: "*** MOTD Configuration ***"
   include_tasks: