diff --git a/modules/jenkins/files/slave_scripts/merge_tags.sh b/modules/jenkins/files/slave_scripts/merge_tags.sh
index b6a741bf67..ec2a707e10 100755
--- a/modules/jenkins/files/slave_scripts/merge_tags.sh
+++ b/modules/jenkins/files/slave_scripts/merge_tags.sh
@@ -14,14 +14,17 @@
 
 TAG=$1
 
-git config user.name "OpenStack Jenkins"
-git config user.email "jenkins@openstack.org"
-git config gitreview.username "jenkins"
+if $(git tag --contains origin/milestone-proposed | grep "^$TAG$" >/dev/null)
+then
+    git config user.name "OpenStack Jenkins"
+    git config user.email "jenkins@openstack.org"
+    git config gitreview.username "jenkins"
 
-git review -s
-git checkout master
-git reset --hard origin/master
-git merge -s ours $TAG
-# Get a Change-Id
-GIT_EDITOR=true git commit --amend
-git review -R -t merge/release-tag
+    git review -s
+    git checkout master
+    git reset --hard origin/master
+    git merge -s ours $TAG
+    # Get a Change-Id
+    GIT_EDITOR=true git commit --amend
+    git review -R -t merge/release-tag
+fi
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d9d038f20a..77c76add0c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -271,8 +271,6 @@ jobs:
     branch: ^(?!stable/(folsom|grizzly)).*$
   - name: manuals-upstream-translation-update
     branch: ^master$
-  - name: ^.*-merge-release-tags$
-    branch: milestone-proposed
   - name: gate-hacking-python33
     voting: false
   - name: gate-hacking-pypy