diff --git a/roles/taskotron/imagefactory/tasks/main.yml b/roles/taskotron/imagefactory/tasks/main.yml
index 95960ab5d9..67deaa2e27 100644
--- a/roles/taskotron/imagefactory/tasks/main.yml
+++ b/roles/taskotron/imagefactory/tasks/main.yml
@@ -83,7 +83,6 @@
     special_time: daily
     job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release {{ item }} --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null'
   with_items:
-    - 26
     - 27
     - 28
     - rawhide
diff --git a/roles/taskotron/taskotron-client/files/yumrepoinfo.conf b/roles/taskotron/taskotron-client/files/yumrepoinfo.conf
index 3dba1666d4..36f8a99a25 100644
--- a/roles/taskotron/taskotron-client/files/yumrepoinfo.conf
+++ b/roles/taskotron/taskotron-client/files/yumrepoinfo.conf
@@ -25,8 +25,8 @@ alternate_arches = aarch64, i386, ppc64, ppc64le, s390x
 # a direct parent of this repo, essential for operations (dependencies)
 parent =
 
-# koji tag defaults to section name
-tag = %(__name__)s
+# koji tag matching the repo
+tag =
 
 # release_status can be one of: obsolete, stable, branched or rawhide
 # for non-top-parent repos this is an empty string
@@ -41,24 +41,28 @@ release_status = rawhide
 
 # Fedora 28
 [f28]
-url = %(rawhideurl)s
-path = development/28
-release_status = branched
+url = %(goldurl)s
+path = 28
+tag = f28
+release_status = stable
 
 [f28-updates]
 url = %(updatesurl)s
 path = 28
 parent = f28
+tag = f28-updates
 
 [f28-updates-testing]
 url = %(updatesurl)s
 path = testing/28
 parent = f28-updates
+tag = f28-updates-testing
 
 # Fedora 27
 [f27]
 url = %(goldurl)s
 path = 27
+tag = f27
 release_status = stable
 
 [f27-updates]
@@ -66,27 +70,11 @@ url = %(updatesurl)s
 path = 27
 parent = f27
 updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
+tag = f27-updates
 
 [f27-updates-testing]
 url = %(updatesurl)s
 path = testing/27
 parent = f27-updates
 updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
-
-# Fedora 26
-[f26]
-url = %(goldurl)s
-path = 26
-release_status = stable
-
-[f26-updates]
-url = %(updatesurl)s
-path = 26
-parent = f26
-updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
-
-[f26-updates-testing]
-url = %(updatesurl)s
-path = testing/26
-parent = f26-updates
-updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
+tag = f27-updates-testing