diff --git a/playbooks/buildset-registry/post.yaml b/playbooks/buildset-registry/post.yaml
deleted file mode 100644
index c64e8ef331..0000000000
--- a/playbooks/buildset-registry/post.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: localhost
-  roles:
-    - push-to-intermediate-registry
diff --git a/playbooks/buildset-registry/pre.yaml b/playbooks/buildset-registry/pre.yaml
deleted file mode 100644
index 68ba76617b..0000000000
--- a/playbooks/buildset-registry/pre.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- hosts: all
-  roles:
-    - install-docker
-    - run-buildset-registry
-    - use-buildset-registry
-  tasks:
-    - name: Open iptables port for registry
-      become: true
-      iptables:
-        chain: openstack-INPUT
-        protocol: tcp
-        match: state
-        ctstate: NEW
-        destination_port: 5000
-        jump: ACCEPT
-        rule_num: 7
-        action: insert
-
-- hosts: localhost
-  roles:
-    - pull-from-intermediate-registry
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index da1555137b..551d29bf68 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1198,15 +1198,3 @@
 
       The testing is done for Ubuntu Xenial.
     nodeset: ubuntu-xenial
-
-- job:
-    name: openstack-buildset-registry
-    description: |
-      Inherit from this job to get a buildset registry which interacts
-      with the intermediate CI registry to share speculative container
-      images between projects.
-    pre-run: playbooks/buildset-registry/pre.yaml
-    post-run: playbooks/buildset-registry/post.yaml
-    secrets:
-      - secret: opendev-intermediate-registry
-        name: intermediate_registry
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
index 00b46ccdb8..af830b5c19 100644
--- a/zuul.d/secrets.yaml
+++ b/zuul.d/secrets.yaml
@@ -695,21 +695,3 @@
           3MX5nl+WG/X0P2tygYBnNz5Gg8jD7s2JMiK4SxiW/Eh0OedJjT/4xQJWn5FXNT9Rr68LQ
           vmUXAIAaetiUdqeMWPRmwjMN+AicClbNWmLNFGXP3eqWQwp/Jp0fWY+8dV3aeHlB+kc92
           D9dOc6WmAHlzOJsvrZYWpizB2MW4ScVSUFbVe2d3FxzR6++mxM5t71D6tTqTW4=
-
-- secret:
-    name: opendev-intermediate-registry
-    data:
-      host: insecure-ci-registry.opendev.org
-      port: 5000
-      username: zuul
-      password: !encrypted/pkcs1-oaep
-        - T7Apjf8G4N40dsoM8XKbOeMQBqWSi9OxGxrTfQvQ3AqB6amFEF1ZR+ESFhrLJpizO4bb4
-          NR7lpKOivBXUzIc3f5Oz6oyFeitzKeropP8IuQBzHaFhL9XzBJZRRTFwA/jSn/iBDl2KT
-          A9n1nXMMbc1tpulISgWMy+I94Nei5crwvyozLn0wjgCO34WpU094oC12P1ijWrx1NXwqL
-          FoYg+UCSMb/3WmjvzaEZEQcqg1tF3vc+BA6TgqflF40LZdPyPoLUzts5okQHrDhPl8KBl
-          fR1KQgYJLlEfHufW5KWEFiFAzQK3QCeAMFIcTDXyRJRujgdgyBgtuv7G+JnqrZt6HXdcG
-          qtJrPlfMTxw9lba/9h5lm4HMfKr52bAoIYJ2n1keh4mMBmLBf+tyoTk/FbZF0vgSN4dWZ
-          yd1ZT610oAWfliiIOf+JHc9EkPapMdrieFk65HZ0lqeDfZAvsQf18BW9AW6hI1SGrDz4n
-          JLPyS7s2bHn9UEzZt2PFtJQAerCMDwnzE4uc7M/A6UoDTbizm72qcpcHSYMXas7Nsrmcz
-          MvxZWy/Np/osLkQ+PRYBv0Bbd0xJkYkBtTEaE8zPkglOkYwqx6l4F0D6rJbjs5F/FDF2I
-          0AEx56fn26W0LFC3h/JtnjmL9mmLHQ0YS6LMujsDEUonV5UoDHNrviTNLMuEy0=