diff --git a/playbooks/noop.yaml b/playbooks/noop.yaml
new file mode 100644
index 0000000..4ed8337
--- /dev/null
+++ b/playbooks/noop.yaml
@@ -0,0 +1,2 @@
+- hosts: localhost
+  tasks: []
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d321221..812ca64 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,3 +1,12 @@
+- job:
+    name: opendev-zuul-jobs-noop
+    description: |
+      A temporary noop job until we can use the built-in one
+
+      (The built-in noop job currently has a bug if a repo-state call
+      is involved.)
+    run: playbooks/noop.yaml
+
 - job:
     name: opendev-build-diskimage-base
     description: |
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ca32529..7c3423a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,11 +1,11 @@
 - project:
     check:
       jobs:
-        - noop
+        - opendev-zuul-jobs-noop
         - opendev-build-diskimage-debian-bullseye
     gate:
       jobs:
-        - noop
+        - opendev-zuul-jobs-noop
         - opendev-build-diskimage-debian-bullseye:
             secrets:
               - name: image_upload_secret