diff --git a/bin/update_repo.sh b/bin/update_repo.sh
index e0fc828..a472378 100755
--- a/bin/update_repo.sh
+++ b/bin/update_repo.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+OSGTAGS=/etc/osg-koji-tags/osg-tags
 
 usage () {
   echo "Usage: $(basename "$0") TAG"
@@ -48,6 +48,11 @@ reponame=$TAG
 repo_working_path="$working_path/$reponame/$arch"
 repo_working_srpm_path="$working_path/$reponame/source/SRPMS"
 
+if test -d $release_path && grep -q $TAG $OSGTAGS.create-only ; then
+  echo "Tag $TAG is create-only and already exists. Skipping"
+  exit 0
+fi
+
 mkdir -p "$release_path" "$working_path" "$previous_path"
 mash "$reponame" -o "$working_path" -p "$release_path"
 
diff --git a/etc/osg-koji-tags/osg-tags.create-only b/etc/osg-koji-tags/osg-tags.create-only
new file mode 100644
index 0000000..1fe574f
--- /dev/null
+++ b/etc/osg-koji-tags/osg-tags.create-only
@@ -0,0 +1,18 @@
+osg-3.5-el7-contrib
+osg-3.5-el7-empty
+osg-3.5-el7-release
+osg-3.5-el7-rolling
+osg-3.5-el7-testing
+osg-3.5-el8-contrib
+osg-3.5-el8-empty
+osg-3.5-el8-release
+osg-3.5-el8-rolling
+osg-3.5-el8-testing
+osg-3.5-upcoming-el7-development
+osg-3.5-upcoming-el7-release
+osg-3.5-upcoming-el7-rolling
+osg-3.5-upcoming-el7-testing
+osg-3.5-upcoming-el8-development
+osg-3.5-upcoming-el8-release
+osg-3.5-upcoming-el8-rolling
+osg-3.5-upcoming-el8-testing
diff --git a/etc/osg-koji-tags/osg-tags.exclude b/etc/osg-koji-tags/osg-tags.exclude
index f3d0d99..cf4ef73 100644
--- a/etc/osg-koji-tags/osg-tags.exclude
+++ b/etc/osg-koji-tags/osg-tags.exclude
@@ -20,23 +20,3 @@ osg-3.4-el7-empty
 osg-3.4-el7-release
 osg-3.4-el7-rolling
 osg-3.4-el7-testing
-osg-3.5-el7-contrib
-osg-3.5-el7-development
-osg-3.5-el7-empty
-osg-3.5-el7-release
-osg-3.5-el7-rolling
-osg-3.5-el7-testing
-osg-3.5-el8-contrib
-osg-3.5-el8-development
-osg-3.5-el8-empty
-osg-3.5-el8-release
-osg-3.5-el8-rolling
-osg-3.5-el8-testing
-osg-3.5-upcoming-el7-development
-osg-3.5-upcoming-el7-release
-osg-3.5-upcoming-el7-rolling
-osg-3.5-upcoming-el7-testing
-osg-3.5-upcoming-el8-development
-osg-3.5-upcoming-el8-release
-osg-3.5-upcoming-el8-rolling
-osg-3.5-upcoming-el8-testing