diff --git a/playbooks/publications/run.yaml b/playbooks/publications/run.yaml
index f68982d070..05f6e21503 100644
--- a/playbooks/publications/run.yaml
+++ b/playbooks/publications/run.yaml
@@ -9,7 +9,7 @@
         cmd: |
           set -x
           # NAME will either be the branch name or the tag name
-          NAME=`echo $ZUUL_REFNAME | sed 's/refs.tags.//'`
+          NAME=`echo {{ zuul.ref }} | sed 's/refs.tags.//'`
           mkdir -p _out/$NAME
           for FN in * ; do
               if [ "_out" != "$FN" ] ; then
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 5074725292..36623d2cff 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -496,6 +496,8 @@
     post-run:
       - playbooks/publish/publications-index.yaml
       - playbooks/publish/openstack-afs.yaml
+    # Index is always published from master
+    override-branch: master
     allowed-projects:
       - openstack-infra/publications
     roles: