diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
index 401bfad1df..a7b49edfd3 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
@@ -30,11 +30,7 @@
   tags: patch_update
 
 - name: Enable CentOS-PowerTools repo for CentOS8
-  replace:
-    path: /etc/yum.repos.d/CentOS-Linux-PowerTools.repo
-    regexp: 'enabled=0'
-    replace: "enabled=1"
-  failed_when: false
+  shell: dnf config-manager --set-enabled powertools
   when:
     - ansible_distribution_major_version == "8"
   tags: patch_update
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
index e0446d9630..b1722a56b5 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
@@ -84,7 +84,7 @@ Additional_Build_Tools_CentOS_x86:
   - libstdc++.i686                # a dependency required for executing a 32-bit C binary
 
 Additional_Build_Tools_CentOS8_Stream:
-  - libdwarf.x86_64
+  - libdwarf
   - libmpc-devel
 
 Additional_Build_Tools_NOT_CentOS8_Stream: