diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml b/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml
index b1b0f08396..9ce7f8d7a6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/infra-publications.yaml
@@ -6,13 +6,19 @@
 
     builders:
       - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -x
+          # NAME will either be the branch name or the tag name
+          NAME=`echo $ZUUL_REFNAME | sed 's/refs.tags.//'`
+          mkdir -p _out/$NAME
+          mv * _out/$NAME
 
     publishers:
       - ftp:
           site: docs.openstack.org
-          source: '**'
-          target: 'infra/publications/$ZUUL_REF/'
-          remove-prefix: ''
+          source: '_out/**'
+          target: 'infra/publications/'
+          remove-prefix: '_out/'
           excludes: ''
       - console-log
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index cd125389a7..e6aef7ca69 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -52,6 +52,15 @@ pipelines:
         - event: ref-updated
           ref: ^(?!(devnull|refs/.*)).*$
 
+  - name: tag
+    description: This pipeline runs jobs in response to any tag event.
+    manager: IndependentPipelineManager
+    precedence: high
+    trigger:
+      gerrit:
+        - event: ref-updated
+          ref: ^refs/tags/.*$
+
   - name: pre-release
     description: This pipeline runs jobs on projects in response to pre-release tags.
     manager: IndependentPipelineManager
@@ -2435,6 +2444,9 @@ projects:
     post:
       - infra-publications-publish
       - infra-publications-publish-index
+    tag:
+      - infra-publications-publish
+      - infra-publications-publish-index
 
   - name: openstack-infra/puppet-apparmor
     check: