diff --git a/.packit.yaml b/.packit.yaml
index faef6825c..ce7c07e8d 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -44,18 +44,24 @@ jobs:
     # get version from spec file instead from git tag
     - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'"
 
-- job: tests
+
+- &sanity-79to86
+  job: tests
   fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
-  fmf_ref: "master"
+  fmf_ref: "main"
   use_internal_tf: True
   trigger: pull_request
+  labels:
+    - sanity
   targets:
     epel-7-x86_64:
       distros: [RHEL-7.9-ZStream]
-  identifier: tests-7.9to8.6
-  tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)"
-  tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
+  identifier: sanity-7.9to8.6
+  tmt_plan: ""
   tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:sanity & enabled:true'
     environments:
       - artifacts:
         - type: "repository"
@@ -64,25 +70,34 @@ jobs:
             - leapp-repository
             - python2-leapp
             - leapp-upgrade-el7toel8-deps
+          order: 40
         tmt:
           context:
             distro: "rhel-7.9"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
   env:
     SOURCE_RELEASE: "7.9"
     TARGET_RELEASE: "8.6"
+    LEAPPDATA_BRANCH: "upstream"
 
-- job: tests
-  fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
-  fmf_ref: "master"
-  use_internal_tf: True
-  trigger: pull_request
+- &sanity-79to86-aws
+  <<: *sanity-79to86
+  labels:
+    - sanity
+    - aws
   targets:
     epel-7-x86_64:
-      distros: [RHEL-7.9-ZStream]
-  identifier: tests-7.9to8.8
-  tmt_plan: "^(?!.*max_sst)(.*tier1)"
-  tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
+      distros: [RHEL-7.9-rhui]
+  identifier: sanity-7.9to8.6-aws-e2e
+  # NOTE(ivasilev) Unfortunately to use yaml templates we need to rewrite the whole tf_extra_params dict
+  # to use plan_filter (can't just specify one section test.tmt.plan_filter, need to specify environments.* as well)
   tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:e2e & enabled:true'
     environments:
       - artifacts:
         - type: "repository"
@@ -91,46 +106,90 @@ jobs:
             - leapp-repository
             - python2-leapp
             - leapp-upgrade-el7toel8-deps
+          order: 40
         tmt:
           context:
             distro: "rhel-7.9"
+        settings:
+          provisioning:
+            post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum-config-manager --enable rhel-7-server-rhui-optional-rpms"
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.6"
+    RHUI: "aws"
+    LEAPPDATA_BRANCH: "upstream"
+
+- &sanity-79to88-aws
+  <<: *sanity-79to86-aws
+  identifier: sanity-7.9to8.8-aws-e2e
   env:
     SOURCE_RELEASE: "7.9"
     TARGET_RELEASE: "8.8"
+    RHUI: "aws"
+    LEAPPDATA_BRANCH: "upstream"
 
+- &sanity-79to89-aws
+  <<: *sanity-79to86-aws
+  identifier: sanity-7.9to8.9-aws-e2e
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.9"
+    RHUI: "aws"
+    LEAPPDATA_BRANCH: "upstream"
 
-# - job: tests
-#   fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
-#   fmf_ref: "master"
-#   use_internal_tf: True
-#   trigger: pull_request
-#   targets:
-#     epel-7-x86_64:
-#       distros: [RHEL-7.9-ZStream]
-#   identifier: tests-7.9to8.8-sst
-#   tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)"
-#   tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
-#   tf_extra_params:
-#     environments:
-#       - tmt:
-#           context:
-#             distro: "rhel-7.9"
-#   env:
-#     SOURCE_RELEASE: "7.9"
-#     TARGET_RELEASE: "8.8"
-
-- job: tests
-  fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
-  fmf_ref: "master"
-  use_internal_tf: True
-  trigger: pull_request
-  targets:
-    epel-7-x86_64:
-      distros: [RHEL-7.9-rhui]
-  identifier: tests-7to8-aws-e2e
-  tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)"
-  tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; echo 42; yum-config-manager --enable rhel-7-server-rhui-optional-rpms"
+- &sanity-79to810-aws
+  <<: *sanity-79to86-aws
+  identifier: sanity-7.9to8.10-aws-e2e
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.10"
+    RHUI: "aws"
+    LEAPPDATA_BRANCH: "upstream"
+
+# On-demand minimal beaker tests
+- &beaker-minimal-79to86
+  <<: *sanity-79to86
+  manual_trigger: True
+  labels:
+    - beaker-minimal
+    - beaker-minimal-7.9to8.6
+    - 7.9to8.6
+  identifier: sanity-7.9to8.6-beaker-minimal
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:partitioning & tag:7to8 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-7-x86_64/"
+          packages:
+            - leapp-repository
+            - python2-leapp
+            - leapp-upgrade-el7toel8-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-7.9"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+
+# On-demand kernel-rt tests
+- &kernel-rt-79to86
+  <<: *beaker-minimal-79to86
+  labels:
+    - kernel-rt
+    - kernel-rt-7.9to8.6
+    - 7.9to8.6
+  identifier: sanity-7.9to8.6-kernel-rt
   tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:kernel-rt & tag:7to8 & enabled:true'
     environments:
       - artifacts:
         - type: "repository"
@@ -139,26 +198,127 @@ jobs:
             - leapp-repository
             - python2-leapp
             - leapp-upgrade-el7toel8-deps
+          order: 40
         tmt:
           context:
             distro: "rhel-7.9"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+
+- &sanity-79to88
+  <<: *sanity-79to86
+  identifier: sanity-7.9to8.8
   env:
     SOURCE_RELEASE: "7.9"
-    TARGET_RELEASE: "8.6"
-    RHUI: "aws"
+    TARGET_RELEASE: "8.8"
+    LEAPPDATA_BRANCH: "upstream"
 
-- job: tests
-  fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
-  fmf_ref: "master"
-  use_internal_tf: True
-  trigger: pull_request
+# On-demand minimal beaker tests
+- &beaker-minimal-79to88
+  <<: *beaker-minimal-79to86
+  labels:
+    - beaker-minimal
+    - beaker-minimal-7.9to8.8
+    - 7.9to8.8
+  identifier: sanity-7.9to8.8-beaker-minimal
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.8"
+    LEAPPDATA_BRANCH: "upstream"
+
+# On-demand kernel-rt tests
+- &kernel-rt-79to88
+  <<: *kernel-rt-79to86
+  labels:
+    - kernel-rt
+    - kernel-rt-7.9to8.8
+    - 7.9to8.8
+  identifier: sanity-7.9to8.8-kernel-rt
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.8"
+    LEAPPDATA_BRANCH: "upstream"
+
+- &sanity-79to89
+  <<: *sanity-79to86
+  identifier: sanity-7.9to8.9
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.9"
+    LEAPPDATA_BRANCH: "upstream"
+
+# On-demand minimal beaker tests
+- &beaker-minimal-79to89
+  <<: *beaker-minimal-79to86
+  labels:
+    - beaker-minimal
+    - beaker-minimal-7.9to8.9
+    - 7.9to8.9
+  identifier: sanity-7.9to8.9-beaker-minimal
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.9"
+    LEAPPDATA_BRANCH: "upstream"
+
+# On-demand kernel-rt tests
+- &kernel-rt-79to89
+  <<: *kernel-rt-79to88
+  labels:
+    - kernel-rt
+    - kernel-rt-7.9to8.9
+    - 7.9to8.9
+  identifier: sanity-7.9to8.9-kernel-rt
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.9"
+    LEAPPDATA_BRANCH: "upstream"
+
+- &sanity-79to810
+  <<: *sanity-79to86
+  identifier: sanity-7.9to8.10
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.10"
+    LEAPPDATA_BRANCH: "upstream"
+
+# On-demand minimal beaker tests
+- &beaker-minimal-79to810
+  <<: *beaker-minimal-79to86
+  labels:
+    - beaker-minimal
+    - beaker-minimal-7.9to8.10
+    - 7.9to8.10
+  identifier: sanity-7.9to8.10-beaker-minimal
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.10"
+    LEAPPDATA_BRANCH: "upstream"
+
+# On-demand kernel-rt tests
+- &kernel-rt-79to810
+  <<: *kernel-rt-79to88
+  labels:
+    - kernel-rt
+    - kernel-rt-7.9to8.10
+    - 7.9to8.10
+  identifier: sanity-7.9to8.10-kernel-rt
+  env:
+    SOURCE_RELEASE: "7.9"
+    TARGET_RELEASE: "8.10"
+    LEAPPDATA_BRANCH: "upstream"
+
+- &sanity-86to90
+  <<: *sanity-79to86
   targets:
     epel-8-x86_64:
       distros: [RHEL-8.6.0-Nightly]
-  identifier: tests-8.6to9.0
-  tmt_plan: "^(?!.*max_sst)(.*tier1)"
-  tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
+  identifier: sanity-8.6to9.0
   tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:sanity & tag:8to9 & enabled:true'
     environments:
       - artifacts:
         - type: "repository"
@@ -167,26 +327,96 @@ jobs:
             - leapp-repository
             - python3-leapp
             - leapp-upgrade-el8toel9-deps
+          order: 40
         tmt:
           context:
             distro: "rhel-8.6"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
   env:
     SOURCE_RELEASE: "8.6"
     TARGET_RELEASE: "9.0"
-    RHSM_REPOS: "rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms"
+    RHSM_REPOS_EUS: "eus"
+    LEAPPDATA_BRANCH: "upstream"
 
-- job: tests
-  fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
-  fmf_ref: "master"
-  use_internal_tf: True
-  trigger: pull_request
+# On-demand minimal beaker tests
+- &beaker-minimal-86to90
+  <<: *beaker-minimal-79to86
+  labels:
+    - beaker-minimal
+    - beaker-minimal-8.6to9.0
+    - 8.6to9.0
+  targets:
+    epel-8-x86_64:
+      distros: [RHEL-8.6.0-Nightly]
+  identifier: sanity-8.6to9.0-beaker-minimal
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:partitioning & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.6"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "8.6"
+    TARGET_RELEASE: "9.0"
+    RHSM_REPOS_EUS: "eus"
+    LEAPPDATA_BRANCH: "upstream"
+
+# On-demand kernel-rt tests
+- &kernel-rt-86to90
+  <<: *beaker-minimal-86to90
+  labels:
+    - kernel-rt
+    - kernel-rt-8.6to9.0
+    - 8.6to9.0
+  identifier: sanity-8.6to9.0-kernel-rt
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:kernel-rt & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.6"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+
+- &sanity-88to92
+  <<: *sanity-86to90
   targets:
     epel-8-x86_64:
       distros: [RHEL-8.8.0-Nightly]
-  identifier: tests-8.8to9.2
-  tmt_plan: "^(?!.*max_sst)(.*tier1)"
-  tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
+  identifier: sanity-8.8to9.2
   tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:sanity & tag:8to9 & enabled:true'
     environments:
       - artifacts:
         - type: "repository"
@@ -195,48 +425,293 @@ jobs:
             - leapp-repository
             - python3-leapp
             - leapp-upgrade-el8toel9-deps
+          order: 40
         tmt:
           context:
             distro: "rhel-8.8"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
   env:
     SOURCE_RELEASE: "8.8"
     TARGET_RELEASE: "9.2"
-    RHSM_REPOS: "rhel-8-for-x86_64-appstream-beta-rpms,rhel-8-for-x86_64-baseos-beta-rpms"
+    RHSM_REPOS_EUS: "eus"
+    LEAPPDATA_BRANCH: "upstream"
     LEAPP_DEVEL_TARGET_RELEASE: "9.2"
 
-# - job: tests
-#   fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
-#   fmf_ref: "master"
-#   use_internal_tf: True
-#   trigger: pull_request
-#   targets:
-#     epel-8-x86_64:
-#       distros: [RHEL-8.6.0-Nightly]
-#   identifier: tests-8.6to9.0-sst
-#   tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)"
-#   tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
-#   tf_extra_params:
-#     environments:
-#       - tmt:
-#           context:
-#             distro: "rhel-8.6"
-#   env:
-#     SOURCE_RELEASE: "8.6"
-#     TARGET_RELEASE: "9.0"
-#     RHSM_REPOS: "rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms"
-
-- job: tests
-  fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
-  fmf_ref: "master"
-  use_internal_tf: True
-  trigger: pull_request
+# On-demand minimal beaker tests
+- &beaker-minimal-88to92
+  <<: *beaker-minimal-86to90
+  labels:
+    - beaker-minimal
+    - beaker-minimal-8.8to9.2
+    - 8.6to9.2
+  targets:
+    epel-8-x86_64:
+      distros: [RHEL-8.8.0-Nightly]
+  identifier: sanity-8.8to9.2-beaker-minimal
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:partitioning & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.8"
+        settings:
+          provisioning:
+            post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "8.8"
+    TARGET_RELEASE: "9.2"
+    LEAPPDATA_BRANCH: "upstream"
+    LEAPP_DEVEL_TARGET_RELEASE: "9.2"
+
+# On-demand kernel-rt tests
+- &kernel-rt-88to92
+  <<: *beaker-minimal-88to92
+  labels:
+    - kernel-rt
+    - kernel-rt-8.8to9.2
+    - 8.8to9.2
+  identifier: sanity-8.8to9.2-kernel-rt
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:kernel-rt & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.8"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+
+- &sanity-89to93
+  <<: *sanity-88to92
+  targets:
+    epel-8-x86_64:
+      distros: [RHEL-8.9.0-Nightly]
+  identifier: sanity-8.9to9.3
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:sanity & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.9"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "8.9"
+    TARGET_RELEASE: "9.3"
+    LEAPPDATA_BRANCH: "upstream"
+    LEAPP_DEVEL_TARGET_RELEASE: "9.3"
+
+# On-demand minimal beaker tests
+- &beaker-minimal-89to93
+  <<: *beaker-minimal-88to92
+  labels:
+    - beaker-minimal
+    - beaker-minimal-8.9to9.3
+    - 8.9to9.3
+  targets:
+    epel-8-x86_64:
+      distros: [RHEL-8.9.0-Nightly]
+  identifier: sanity-8.9to9.3-beaker-minimal
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:partitioning & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.9"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "8.9"
+    TARGET_RELEASE: "9.3"
+    LEAPPDATA_BRANCH: "upstream"
+    LEAPP_DEVEL_TARGET_RELEASE: "9.3"
+
+# On-demand kernel-rt tests
+- &kernel-rt-89to93
+  <<: *beaker-minimal-89to93
+  labels:
+    - kernel-rt
+    - kernel-rt-8.9to9.3
+    - 8.9to9.3
+  identifier: sanity-8.9to9.3-kernel-rt
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:kernel-rt & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.9"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+
+- &sanity-810to94
+  <<: *sanity-88to92
+  targets:
+    epel-8-x86_64:
+      distros: [RHEL-8.10.0-Nightly]
+  identifier: sanity-8.10to9.4
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:sanity & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.10"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "8.10"
+    TARGET_RELEASE: "9.4"
+    RHSM_REPOS: "rhel-8-for-x86_64-appstream-beta-rpms,rhel-8-for-x86_64-baseos-beta-rpms"
+    LEAPPDATA_BRANCH: "upstream"
+
+# On-demand minimal beaker tests
+- &beaker-minimal-810to94
+  <<: *beaker-minimal-88to92
+  labels:
+    - beaker-minimal
+    - beaker-minimal-8.10to9.4
+    - 8.10to9.4
+  targets:
+    epel-8-x86_64:
+      distros: [RHEL-8.10.0-Nightly]
+  identifier: sanity-8.10to9.4-beaker-minimal
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:partitioning & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.10"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+  env:
+    SOURCE_RELEASE: "8.10"
+    TARGET_RELEASE: "9.4"
+    LEAPPDATA_BRANCH: "upstream"
+
+# On-demand kernel-rt tests
+- &kernel-rt-810to94
+  <<: *beaker-minimal-810to94
+  labels:
+    - kernel-rt
+    - kernel-rt-8.10to9.4
+    - 8.10to9.4
+  identifier: sanity-8.10to9.4-kernel-rt
+  tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:kernel-rt & tag:8to9 & enabled:true'
+    environments:
+      - artifacts:
+        - type: "repository"
+          id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/"
+          packages:
+            - leapp-repository
+            - python3-leapp
+            - leapp-upgrade-el8toel9-deps
+          order: 40
+        tmt:
+          context:
+            distro: "rhel-8.10"
+        settings:
+          provisioning:
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
+
+- &sanity-86to90-aws
+  <<: *sanity-79to86-aws
   targets:
     epel-8-x86_64:
       distros: [RHEL-8.6-rhui]
-  identifier: tests-8to9-aws-e2e
-  tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)"
-  tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
+  identifier: sanity-8.6to9.0-aws-e2e
   tf_extra_params:
+    test:
+      tmt:
+        plan_filter: 'tag:e2e & enabled:true'
     environments:
       - artifacts:
         - type: "repository"
@@ -245,11 +720,18 @@ jobs:
             - leapp-repository
             - python3-leapp
             - leapp-upgrade-el8toel9-deps
+          order: 40
         tmt:
           context:
             distro: "rhel-8.6"
+        settings:
+          provisioning:
+            post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
+            tags:
+              BusinessUnit: sst_upgrades@leapp_upstream_test
   env:
     SOURCE_RELEASE: "8.6"
     TARGET_RELEASE: "9.0"
     RHSM_REPOS: "rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms"
     RHUI: "aws"
+    LEAPPDATA_BRANCH: "upstream"