diff --git a/init-refresh-koji-tags.yml b/init-refresh-koji-tags.yml
index f4d0d30..7680491 100644
--- a/init-refresh-koji-tags.yml
+++ b/init-refresh-koji-tags.yml
@@ -2,6 +2,11 @@
 - name: Update Koji Tags
   hosts: all
   become: true
+  vars_files:
+    - "vars/common.yml"
+    - "vars/koji.yml"
+    - "vars/koji_pkgs.yml"
+    - "vars/koji_modules.yml"
   pre_tasks:
     - name: Check if ansible cannot be run here
       ansible.builtin.stat:
diff --git a/tasks/koji/setup_non_build_tags.yml b/tasks/koji/setup_non_build_tags.yml
index 587e732..90980e7 100644
--- a/tasks/koji/setup_non_build_tags.yml
+++ b/tasks/koji/setup_non_build_tags.yml
@@ -5,4 +5,18 @@
     state: present
     packages: "{{ koji_pkgs }}"
   with_items: "{{ all_koji_nb_tags }}"
+
+- name: "Create all extra tags and their packages"
+  ktdreyer.koji_ansible.koji_tag:
+    name: "{{ item }}"
+    state: present
+    packages: "{{ koji_extra_pkgs }}"
+  with_items: "{{ all_koji_extra_tags }}"
+
+- name: "Create all plus tags and their packages"
+  ktdreyer.koji_ansible.koji_tag:
+    name: "{{ item }}"
+    state: present
+    packages: "{{ koji_plus_pkgs }}"
+  with_items: "{{ all_koji_plus_tags }}"
 ...
diff --git a/vars/koji.yml b/vars/koji.yml
index d17eb3c..2c51b0c 100644
--- a/vars/koji.yml
+++ b/vars/koji.yml
@@ -36,11 +36,13 @@ all_koji_m_tags:
   - dist-rocky8-module-compose
   - dist-rocky8-prep-module-compose
   - dist-rocky8-lookahead-module-compose
-all_koji_nbe_tags:
+all_koji_extra_tags:
   - dist-rocky8-extras
   - dist-rocky8-extras-compose
+all_koji_infra_tags:
   - dist-rocky8-infra
   - dist-rocky8-infra-compose
+all_koji_plus_tags:
   - dist-rocky8-plus
   - dist-rocky8-plus-compose
 koji_groups:
diff --git a/vars/koji_pkgs.yml b/vars/koji_pkgs.yml
index dab0694..4000cad 100644
--- a/vars/koji_pkgs.yml
+++ b/vars/koji_pkgs.yml
@@ -3167,4 +3167,61 @@ koji_pkgs:
     - zsh
     - zstd
     - zziplib
+koji_extra_pkgs:
+  rockykoji:
+    - rpaste
+    - epel-release
+    - rpmfusion-free-release
+    - anaconda-live
+    - rocky-release-cloud
+    - rocky-release-core
+    - centos-release-advanced-virtualization
+    - centos-release-ansible-29
+    - centos-release-ceph-nautilus
+    - centos-release-ceph-octopus
+    - centos-release-ceph-pacific
+    - centos-release-ceph-quincy
+    - centos-release-configmanagement
+    - centos-release-gluster6
+    - centos-release-gluster7
+    - centos-release-gluster8
+    - centos-release-gluster9
+    - centos-release-gluster10
+    - centos-release-kmods
+    - centos-release-kmods-rebuild
+    - centos-release-nfs-ganesha28
+    - centos-release-nfs-ganesha30
+    - centos-release-nfv-common
+    - centos-release-nfv-extras
+    - centos-release-nfv-openvswitch
+    - centos-release-openstack-train
+    - centos-release-openstack-ussuri
+    - centos-release-openstack-victoria
+    - centos-release-openstack-wallaby
+    - centos-release-openstack-xena
+    - centos-release-openstack-yoga
+    - centos-release-opstools
+    - centos-release-ovirt44
+    - centos-release-samba411
+    - centos-release-samba412
+    - centos-release-samba413
+    - centos-release-samba414
+    - centos-release-samba415
+    - centos-release-samba416
+    - centos-release-samba417
+    - centos-release-storage-common
+    - centos-release-virt-common
+    - centos-release-messaging
+    - centos-release-qpid-proton
+    - centos-release-rabbitmq-38
+koji_plus_pkgs:
+  rockykoji:
+    - firefox
+    - thunderbird
+    - screen
+    - openldap
+    - open-vm-tools
+    - mesa
+    - kernel-plus
+    - kmod-redhat-oracleasm
 ...