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 bddbd81f2e..3c2bf3811c 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
@@ -27,6 +27,7 @@ Build_Tool_Packages:
   - glibc-devel
   - gmp-devel
   - java-1.8.0-openjdk-devel
+  - libatomic                     # Needed for RISC-V cross compilation
   - libcurl-devel
   - libpng-devel
   - libXext-devel
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
index cbe2ddf08a..b8f7ac0f9f 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
@@ -25,6 +25,7 @@ Build_Tool_Packages:
   - glibc-common
   - glibc-devel
   - gmp-devel
+  - libatomic                     # Needed for RISC-V cross compilation
   - libcurl-devel
   - libffi-devel
   - libpng-devel