diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index cf98d9aa06..d7e92c3089 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -619,10 +619,13 @@
         pass-to-parent: true
 
 - job:
-    name: promote-governance-sigs
+    name: promote-governance-sigs-static
     parent: base-promote-tox-docs-static
     description: |
       Promote content to static.openstack.org to /srv/static/sigs
+
+      This job is added for transition of sites, it will be
+      removed soon.
     final: true
     allowed-projects:
       - openstack/governance-sigs
@@ -630,16 +633,41 @@
       static_target: sigs
 
 - job:
-    name: promote-governance-tc
+    name: promote-governance-sigs
+    parent: promote-tox-docs-site-base
+    description: |
+      Promote content to governance.openstack.org/sigs.
+    final: true
+    allowed-projects:
+      - openstack/governance-sigs
+    vars:
+      publish_site: "governance.openstack.org/sigs"
+
+- job:
+    name: promote-governance-tc-static
     parent: base-promote-tox-docs-static
     description: |
       Promote content to static.openstack.org to /srv/static/tc
+
+      This job is added for transition of sites, it will be
+      removed soon.
     final: true
     allowed-projects:
       - openstack/governance
     vars:
       static_target: tc
 
+- job:
+    name: promote-governance-tc
+    parent: promote-tox-docs-site-base
+    description: |
+      Promote content to governance.openstack.org/sigs.
+    final: true
+    allowed-projects:
+      - openstack/governance
+    vars:
+      publish_site: "governance.openstack.org/tc"
+
 - job:
     name: promote-governance-uc
     parent: base-promote-tox-docs-static
@@ -652,16 +680,44 @@
       static_target: uc
 
 - job:
-    name: promote-governance-website
+    name: promote-governance-uc-static
+    parent: promote-tox-docs-site-base
+    description: |
+      Promote content to governance.openstack.org/uc.
+
+      This job is added for transition of sites, it will be
+      removed soon.
+    final: true
+    allowed-projects:
+      - openstack/governance-uc
+    vars:
+      publish_site: "governance.openstack.org/uc"
+
+- job:
+    name: promote-governance-website-static
     parent: base-promote-tox-docs-static
     description: |
       Promote content to static.openstack.org to /srv/static/governance
+
+      This job is added for transition of sites, it will be
+      removed soon.
     final: true
     allowed-projects:
       - openstack/governance-website
     vars:
       static_target: governance
 
+- job:
+    name: promote-governance-website
+    parent: promote-tox-docs-site-base
+    description: |
+      Promote content to governance.openstack.org.
+    final: true
+    allowed-projects:
+      - openstack/governance-website
+    vars:
+      publish_site: "governance.openstack.org"
+
 - job:
     name: promote-security
     parent: base-promote-tox-docs-static
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 0a305bb66c..8919526f71 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -2190,12 +2190,28 @@
     name: openstack/governance
     templates:
       - publish-to-pypi
+    promote:
+      jobs:
+        # TODO(AJaeger): Remove once transition to AFS publishing is
+        # done.
+        - promote-governance-tc-static
+
+- project:
+    name: openstack/governance-sigs
+    promote:
+      jobs:
+        # TODO(AJaeger): Remove once transition to AFS publishing is
+        # done.
+        - promote-governance-sigs-static
 
 - project:
     name: openstack/governance-uc
     promote:
       jobs:
         - promote-governance-uc
+        # TODO(AJaeger): Remove once transition to AFS publishing is
+        # done.
+        - promote-governance-uc-static
 
 - project:
     name: openstack/governance-website
@@ -2204,6 +2220,9 @@
     promote:
       jobs:
         - promote-governance-website
+        # TODO(AJaeger): Remove once transition to AFS publishing is
+        # done.
+        - promote-governance-website-static
 
 - project:
     name: openstack/grenade