diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/capstone/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/capstone/tasks/main.yml
index f343f69e43..c313fcfdf7 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/capstone/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/capstone/tasks/main.yml
@@ -35,6 +35,7 @@
   when:
     - (ansible_distribution == "RedHat" or ansible_distribution == "CentOS" or ansible_distribution == "SLES")
     - capstone_installed.rc != 0
+    - (ansible_architecture !+ "riscv64")
   tags: capstone_source
 
 - name: Extract capstone {{ capstone_version }}
@@ -45,13 +46,35 @@
   when:
     - (ansible_distribution == "RedHat" or ansible_distribution == "CentOS" or ansible_distribution == "SLES")
     - capstone_installed.rc != 0
+    - (ansible_architecture !+ "riscv64")
   tags: capstone_source
 
+- name: Set architecture variable for x64
+  set_fact: capstone_architecture=x86
+  when: ansible_architecture == "x86_64"
+
+- name: Set architecture variable for arm32
+  set_fact: capstone_architecture=arm
+  when: ansible_architecture == "armv7l"
+
+- name: Set architecture variable for aarch64
+  set_fact: capstone_architecture=aarch64
+  when: ansible_architecture == "aarch64"
+
+- name: Set architecture variable for ppc64le
+  set_fact: capstone_architecture=powerpc
+  when: ansible_architecture == "ppc64le"
+
+- name: Set architecture variable for s390x
+  set_fact: capstone_architecture=systemz
+  when: ansible_architecture == "s390x"
+
 - name: Build and install capstone {{ capstone_version }}
-  shell: cd /tmp/capstone-{{ capstone_version }}} && ./make.sh && PREFIX=/usr/local ./make.sh install
+  shell: cd /tmp/capstone-{{ capstone_version }}} && CAPSTONE_ARCHS={{ capstone_architcture }}./make.sh && PREFIX=/usr/local ./make.sh install
   when:
     - (ansible_distribution == "RedHat" or ansible_distribution == "CentOS" or ansible_distribution == "Ubuntu" or ansible_distribution == "SLES")
     - capstone_installed.rc != 0
+    - (ansible_architecture !+ "riscv64")
   tags: capstone_source
 
 - name: Remove downloaded packages for capstone {{ capstone_version }}