diff --git a/roles/ceph-validate/tasks/check_repository.yml b/roles/ceph-validate/tasks/check_repository.yml
new file mode 100644
index 000000000..8f0bf1743
--- /dev/null
+++ b/roles/ceph-validate/tasks/check_repository.yml
@@ -0,0 +1,20 @@
+---
+- name: validate ceph_origin
+  fail:
+    msg: "ceph_origin must be either 'repository', 'distro' or 'local'"
+  when: ceph_origin not in ['repository', 'distro', 'local']
+
+- name: validate ceph_repository
+  fail:
+    msg: "ceph_repository must be either 'community', 'rhcs', 'dev', 'custom' or 'uca'"
+  when:
+    - ceph_origin == 'repository'
+    - ceph_repository not in ['community', 'rhcs', 'dev', 'custom', 'uca']
+
+- name: validate ceph_repository_community
+  fail:
+    msg: "ceph_stable_release must be 'pacific'"
+  when:
+    - ceph_origin == 'repository'
+    - ceph_repository == 'community'
+    - ceph_stable_release not in ['pacific']
diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml
index 9723a6029..ccbbdfe28 100644
--- a/roles/ceph-validate/tasks/main.yml
+++ b/roles/ceph-validate/tasks/main.yml
@@ -3,27 +3,8 @@
   include_tasks: check_system.yml
 
 - name: validate repository variables in non-containerized scenario
+  include_tasks: check_repository.yml
   when: not containerized_deployment | bool
-  block:
-    - name: validate ceph_origin
-      fail:
-        msg: "ceph_origin must be either 'repository', 'distro' or 'local'"
-      when: ceph_origin not in ['repository', 'distro', 'local']
-
-    - name: validate ceph_repository
-      fail:
-        msg: "ceph_repository must be either 'community', 'rhcs', 'dev', 'custom' or 'uca'"
-      when:
-        - ceph_origin == 'repository'
-        - ceph_repository not in ['community', 'rhcs', 'dev', 'custom', 'uca']
-
-    - name: validate ceph_repository_community
-      fail:
-        msg: "ceph_stable_release must be 'pacific'"
-      when:
-        - ceph_origin == 'repository'
-        - ceph_repository == 'community'
-        - ceph_stable_release != 'pacific'
 
 - name: validate osd_objectstore
   fail: