diff --git a/SPECS/opencryptoki.spec b/SPECS/opencryptoki.spec
index 0dd8314..be9c748 100644
--- a/SPECS/opencryptoki.spec
+++ b/SPECS/opencryptoki.spec
@@ -1,7 +1,7 @@
 Name: opencryptoki
 Summary: Implementation of the PKCS#11 (Cryptoki) specification v3.0
 Version: 3.24.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: CPL-1.0
 URL: https://github.com/opencryptoki/opencryptoki
 Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -187,10 +187,15 @@ configured with Enterprise PKCS#11 (EP11) firmware.
 %else
     --disable-tpmtok \
 %endif
+%ifarch s390 s390x x86_64 ppc64le
+    --enable-ccatok \
+%else
+    --disable-ccatok \
+%endif
 %ifarch s390 s390x
-    --enable-icatok --enable-ccatok --enable-ep11tok --enable-pkcsep11_migrate
+    --enable-icatok --enable-ep11tok --enable-pkcsep11_migrate
 %else
-    --disable-icatok --enable-ccatok --disable-ep11tok --disable-pkcsep11_migrate --enable-pkcscca_migrate
+    --disable-icatok --disable-ep11tok --disable-pkcsep11_migrate --enable-pkcscca_migrate
 %endif
 
 %make_build CHGRP=/bin/true
@@ -323,6 +328,7 @@ fi
 %dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/lite/TOK_OBJ/
 %endif
 
+%ifarch s390 s390x x86_64 ppc64le
 %files ccatok
 %doc doc/README.cca_stdll
 %config(noreplace) %{_sysconfdir}/%{name}/ccatok.conf
@@ -332,6 +338,7 @@ fi
 %{_libdir}/opencryptoki/stdll/PKCS11_CCA.so
 %dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/ccatok/
 %dir %attr(770,root,pkcs11) %{_sharedstatedir}/%{name}/ccatok/TOK_OBJ/
+%endif
 
 %ifarch s390 s390x
 %files ep11tok
@@ -350,6 +357,10 @@ fi
 
 
 %changelog
+* Tue Nov 26 2024 Than Ngo <than@redhat.com> - 3.24.0-4
+- Disable ccatok on aarch64 and i686
+  Related: RHEL-58996
+
 * Thu Nov 07 2024 Than Ngo <than@redhat.com> - 3.24.0-3
 - Fix resource leak
   Related: RHEL-58996