diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8a1462bb25..38e1c45dba 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -530,6 +530,23 @@
       afs_subpath: "/infra/{{ zuul.project.short_name }}"
       bindep_profile: compile doc
 
+- job:
+    name: publish-tox-docs-infra-bionic
+    parent: publish-openstack-tox-docs-base
+    description: |
+      Publish the results of the tox docs job to
+      /afs/.openstack.org/infra/{{ zuul.project.short_name }}
+      using an ubuntu-bionic nodeset (openstackid will use this
+      to get around the final: true in publish-tox-docs-infra
+      until the default nodeset is updated in the base job)
+    final: true
+    post-run:
+      - playbooks/sphinx/post-infra.yaml
+    vars:
+      afs_subpath: "/infra/{{ zuul.project.short_name }}"
+      bindep_profile: compile doc
+    nodeset: ubuntu-bionic
+
 - job:
     name: publish-infra-manual
     parent: publish-openstack-tox-docs-base
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index a5396ede8d..f2f2fe3dd0 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -512,13 +512,11 @@
     post:
       jobs:
         - legacy-laravel-openstackid-release-branch
-        - publish-tox-docs-infra:
-            nodeset: ubuntu-bionic
+        - publish-tox-docs-infra-bionic
     release:
       jobs:
         - legacy-laravel-openstackid-release-master
-        - publish-tox-docs-infra:
-            nodeset: ubuntu-bionic
+        - publish-tox-docs-infra-bionic
 
 - project:
     name: openstack-infra/openstackid-resources