diff --git a/pipelines/upgrade/05-server_to_intermediate.yml b/pipelines/upgrade/05-server_to_intermediate.yml
index 95ec41b7d..4886d440c 100644
--- a/pipelines/upgrade/05-server_to_intermediate.yml
+++ b/pipelines/upgrade/05-server_to_intermediate.yml
@@ -19,8 +19,6 @@
       scenario: "{{ pipeline_type }}"
       scenario_os: "{{ pipeline_os }}"
       scenario_version: "{{ forklift_upgrade_version_intermediate }}"
-    - role: update_tomcat
-      when: (pipeline_type == 'katello' or pipeline_type == 'luna') and pipeline_os == 'centos8-stream'
     - foreman_server_repositories
     - role: foreman_installer
       foreman_installer_skip_installer: "{{ true if forklift_upgrade_version_start == forklift_upgrade_version_intermediate else false }}"
diff --git a/roles/update_os_packages/tasks/main.yml b/roles/update_os_packages/tasks/main.yml
index 67bf58034..cce1df4cc 100644
--- a/roles/update_os_packages/tasks/main.yml
+++ b/roles/update_os_packages/tasks/main.yml
@@ -1,8 +1,9 @@
 ---
 - name: 'RedHat | Update packages'
-  yum:
+  dnf:
     name: '*'
     update_cache: yes
+    nobest: true # REQUIRED TO WORKAROUND TOMCAT ISSUE -- https://community.theforeman.org/t/katello-nightly-rpm-pipeline-1766-failed/35171
     state: latest
   tags:
     - packages
diff --git a/roles/update_tomcat/tasks/main.yml b/roles/update_tomcat/tasks/main.yml
deleted file mode 100644
index 70a8be93b..000000000
--- a/roles/update_tomcat/tasks/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: Set module hotfixes on AppStream
-  ansible.builtin.lineinfile:
-    path: /etc/yum.repos.d/CentOS-Stream-AppStream.repo
-    line: module_hotfixes=1
-    insertbefore: EOF
-
-- name: Update just tomcat
-  ansible.builtin.package:
-    name: tomcat
-    state: latest
-
-- name: Remove module hotfixes
-  ansible.builtin.lineinfile:
-    path: /etc/yum.repos.d/CentOS-Stream-AppStream.repo
-    line: module_hotfixes=1
-    state: absent