diff --git a/roles/foreman_client_repositories/tasks/_koji_staging_repo.yml b/roles/foreman_client_repositories/tasks/_koji_staging_repo.yml
index dcf0b9af9..b36d7aa4a 100644
--- a/roles/foreman_client_repositories/tasks/_koji_staging_repo.yml
+++ b/roles/foreman_client_repositories/tasks/_koji_staging_repo.yml
@@ -7,3 +7,5 @@
     gpgcheck: no
   tags:
     - packages
+  when:
+    - foreman_client_repositories_version is version('3.9', '<')
\ No newline at end of file
diff --git a/roles/foreman_client_repositories/tasks/staging_repo.yml b/roles/foreman_client_repositories/tasks/staging_repo.yml
index 3a2c1ff7c..5abfad68e 100644
--- a/roles/foreman_client_repositories/tasks/staging_repo.yml
+++ b/roles/foreman_client_repositories/tasks/staging_repo.yml
@@ -8,3 +8,5 @@
 
 - ansible.builtin.include_tasks:
     file: _{{ foreman_client_repositories_staging_source }}_staging_repo.yml
+  when:
+    - foreman_client_repositories_version is version('3.9', '>=')