diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
index c542ed825..3525e0f34 100644
--- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
+++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
@@ -25,10 +25,10 @@
 
 - name: make sure ceph_stable_release is set
   fail:
-    msg: "make sure ceph_stable_release is set to a release name (e.g: luminous), http://docs.ceph.com/docs/master/release-notes/"
+    msg: "make sure ceph_stable_release ( {{ ceph_stable_release }} ) is set to a release name (e.g: luminous), http://docs.ceph.com/docs/master/release-notes/"
   when:
     - ceph_stable_release == 'dummy'
-    - (ceph_repository != 'rhcs' or ceph_repository != 'dev')
+    - ceph_repository not in ['rhcs', 'dev']
   tags:
     - package-install
 
@@ -38,7 +38,7 @@
   when:
     - ceph_stable_release not in ceph_release_num
     - ceph_origin == 'repository'
-    - ceph_repository != 'rhcs'
+    - ceph_repository not in ['rhcs', 'dev']
   tags:
     - package-install