diff --git a/.github/workflows/tests_archdetect.yml b/.github/workflows/tests_archdetect.yml
index bee348995d..f057251050 100644
--- a/.github/workflows/tests_archdetect.yml
+++ b/.github/workflows/tests_archdetect.yml
@@ -15,6 +15,7 @@ jobs:
           - x86_64/amd/zen3/Azure-CentOS7-7V73X
           - x86_64/amd/zen4/Azure-Alma8-9V33X
           - x86_64/amd/zen4/Shinx-RHEL8-9654
+          - aarch64/a64fx/Deucalion-Rocky85
           - aarch64/neoverse_n1/Azure-Ubuntu20-Altra
           - aarch64/neoverse_n1/AWS-awslinux-graviton2
           - aarch64/neoverse_v1/AWS-awslinux-graviton3
diff --git a/init/arch_specs/eessi_arch_arm.spec b/init/arch_specs/eessi_arch_arm.spec
index 8c1bc34d20..476d3d6119 100755
--- a/init/arch_specs/eessi_arch_arm.spec
+++ b/init/arch_specs/eessi_arch_arm.spec
@@ -1,5 +1,6 @@
 # ARM CPU architecture specifications (see https://gpages.juszkiewicz.com.pl/arm-socs-table/arm-socs.html for guidance)
 # Software path in EESSI 	| Vendor ID 	| List of defining CPU features
+"aarch64/a64fx"	""		"asimdhp sve"		# Fujitsu A64FX
 "aarch64/neoverse_n1"	"ARM"		"asimddp"		# Ampere Altra
 "aarch64/neoverse_n1"	""		"asimddp"		# AWS Graviton2
 "aarch64/neoverse_v1"	"ARM"		"asimddp svei8mm"
diff --git a/tests/archdetect/aarch64/a64fx/Deucalion-Rocky85.cpuinfo b/tests/archdetect/aarch64/a64fx/Deucalion-Rocky85.cpuinfo
new file mode 100644
index 0000000000..2484dbe3e7
--- /dev/null
+++ b/tests/archdetect/aarch64/a64fx/Deucalion-Rocky85.cpuinfo
@@ -0,0 +1,8 @@
+processor       : 0
+BogoMIPS        : 200.00
+Features        : fp asimd evtstrm sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm fcma dcpop sve
+CPU implementer : 0x46
+CPU architecture: 8
+CPU variant     : 0x1
+CPU part        : 0x001
+CPU revision    : 0
diff --git a/tests/archdetect/aarch64/a64fx/Deucalion-Rocky85.output b/tests/archdetect/aarch64/a64fx/Deucalion-Rocky85.output
new file mode 100644
index 0000000000..13b6c575c1
--- /dev/null
+++ b/tests/archdetect/aarch64/a64fx/Deucalion-Rocky85.output
@@ -0,0 +1 @@
+aarch64/a64fx