diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 40214ce119..79dbcc2602 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -175,7 +175,7 @@
 
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
-  when: koji_hub_nfs is defined and koji_hub_nfs == "fedora_koji"
+  when: koji_hub_nfs is defined and koji_hub_nfs == "fedora_koji" and createrepo is True
   tags:
   - koji_builder
 
@@ -185,7 +185,7 @@
 
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji dest=/mnt/koji
-  when: koji_hub_nfs is defined and koji_hub_nfs != "fedora_koji"
+  when: koji_hub_nfs is defined and koji_hub_nfs != "fedora_koji" and createrepo is True
   tags:
   - koji_builder