diff --git a/gerrit/acls/opendev/ansible-role-cloud-launcher.config b/gerrit/acls/x/ansible-role-cloud-launcher.config
similarity index 100%
rename from gerrit/acls/opendev/ansible-role-cloud-launcher.config
rename to gerrit/acls/x/ansible-role-cloud-launcher.config
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 924a734d7e..5bd8f6da97 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -105,6 +105,11 @@
       jobs:
         - tox-cover
 
+- project:
+    name: opendev/ci-sandbox
+    templates:
+      - noop-jobs
+
 - project:
     name: opendev/gear
     templates:
@@ -1279,6 +1284,18 @@
       jobs:
         - tox-cover
 
+- project:
+    name: opendev/sandbox
+    release:
+      jobs:
+        - release-openstack-python
+        - legacy-sandbox-tag
+    templates:
+      - noop-jobs
+    pre-release:
+      jobs:
+        - legacy-sandbox-tag
+
 - project:
     name: opendev/statusbot
     templates:
@@ -1347,23 +1364,6 @@
       jobs:
         - tox-pep8
 
-- project:
-    name: opendev/ci-sandbox
-    templates:
-      - noop-jobs
-
-- project:
-    name: opendev/sandbox
-    release:
-      jobs:
-        - release-openstack-python
-        - legacy-sandbox-tag
-    templates:
-      - noop-jobs
-    pre-release:
-      jobs:
-        - legacy-sandbox-tag
-
 - project:
     name: openstack-infra/opendev-website
     templates:
diff --git a/zuul/main.yaml b/zuul/main.yaml
index 94bfa04065..b10b0875eb 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -104,7 +104,6 @@
           - jjb/python-jenkins
           - limestone/ci-cloud-config
           - opendev/afsmon
-          - opendev/ansible-role-cloud-launcher
           - opendev/ansible-role-puppet
           - opendev/askbot-theme
           - opendev/bindep
@@ -1087,6 +1086,7 @@
           - x/alexandria
           - x/almanach
           - x/ansible-role-bindep
+          - x/ansible-role-cloud-launcher
           - x/ansible-role-fedmsg
           - x/ansible-role-jenkins
           - x/ansible-role-jenkins-job-builder