diff --git a/roles/katello_devel/meta/main.yml b/roles/katello_devel/meta/main.yml
index f116c2c5e..b88982920 100644
--- a/roles/katello_devel/meta/main.yml
+++ b/roles/katello_devel/meta/main.yml
@@ -3,7 +3,9 @@ dependencies:
   - role: etc_hosts
   - role: foreman_server_repositories
     foreman_server_repositories_katello: true
+    foreman_repositories_staging_source: 'stagingyum'
     foreman_server_repositories_foreman_client: true
+    katello_repositories_staging_source: 'stagingyum'
 #   puppet 6 is still the default for theforeman.operations.puppet_repositories as of release 1.2.3
     foreman_puppet_repositories_version: 7
   - role: ruby_scl
diff --git a/roles/katello_repositories/tasks/staging_repos.yml b/roles/katello_repositories/tasks/staging_repos.yml
index 364f75604..81fa4daec 100644
--- a/roles/katello_repositories/tasks/staging_repos.yml
+++ b/roles/katello_repositories/tasks/staging_repos.yml
@@ -25,5 +25,4 @@
 - name: 'Add Candlepin repository'
   include_role:
     name: candlepin_repositories
-  when:
-    - candlepin_repositories_version is defined
+  when: candlepin_repositories_version is defined or katello_repositories_staging_source == "stagingyum"