diff --git a/playbooks/groups/oci-registry.yml b/playbooks/groups/oci-registry.yml
index 231b5504fe..896b9a835c 100644
--- a/playbooks/groups/oci-registry.yml
+++ b/playbooks/groups/oci-registry.yml
@@ -25,17 +25,17 @@
   - { role: nfs/client,
       mnt_dir: '/srv/registry',
       nfs_src_dir: "oci_registry",
-      when: "env != 'staging' and 'candidate' not in inventory_hostname" }
+      when: "env != 'staging' or 'candidate' not in inventory_hostname" }
 
   pre_tasks:
-  - name: Create /srv/registry on staging since it does not use NFS
+  - name: Create /srv/registry on staging and candidate since it does not use NFS
     file:
       path: /srv/registry
       state: directory
       owner: root
       group: root
       mode: 0755
-    when: "env == 'staging' and 'candidate' not in inventory_hostname"
+    when: "env == 'staging' or 'candidate' not in inventory_hostname"
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks: