diff --git a/easystacks/software.eessi.io/2026.06/graniterapids/easystack-001-eb-5.3.1.yml b/easystacks/software.eessi.io/2026.06/x86_64/graniterapids/easystack-001-eb-5.3.1.yml
similarity index 100%
rename from easystacks/software.eessi.io/2026.06/graniterapids/easystack-001-eb-5.3.1.yml
rename to easystacks/software.eessi.io/2026.06/x86_64/graniterapids/easystack-001-eb-5.3.1.yml
diff --git a/easystacks/software.eessi.io/2026.06/x86_64/graniterapids/easystack-003-eb-5.4.0.yml b/easystacks/software.eessi.io/2026.06/x86_64/graniterapids/easystack-003-eb-5.4.0.yml
new file mode 100644
index 0000000000..47a5de22a9
--- /dev/null
+++ b/easystacks/software.eessi.io/2026.06/x86_64/graniterapids/easystack-003-eb-5.4.0.yml
@@ -0,0 +1,22 @@
+# easystack-003-eb-5.4.0.yml: total build duration = 341 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/LLVM/21.1.8-GCCcore-15.2.0/20260825_192828UTC/easybuild/LLVM-21.1.8-GCCcore-15.2.0.eb:
+      options:
+        robot: False
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/LLVM/21.1.8-GCCcore-15.2.0/20260825_192828UTC/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/archspec/0.2.6-GCCcore-15.2.0/20260831_123248UTC/easybuild/archspec-0.2.6-GCCcore-15.2.0.eb:
+      options:
+        robot: False
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/archspec/0.2.6-GCCcore-15.2.0/20260831_123248UTC/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/libxslt/1.1.45-GCCcore-15.2.0/20260831_123347UTC/easybuild/libxslt-1.1.45-GCCcore-15.2.0.eb:
+      options:
+        robot: False
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/libxslt/1.1.45-GCCcore-15.2.0/20260831_123347UTC/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/lxml/6.1.1-GCCcore-15.2.0/20260831_123526UTC/easybuild/lxml-6.1.1-GCCcore-15.2.0.eb:
+      options:
+        robot: False
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/lxml/6.1.1-GCCcore-15.2.0/20260831_123526UTC/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/ReFrame/4.10.2-GCCcore-15.2.0-no-analytics/20260831_123624UTC/easybuild/ReFrame-4.10.2-GCCcore-15.2.0-no-analytics.eb:
+      options:
+        robot: False
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2026.06/software/linux/x86_64/intel/sapphirerapids/reprod/ReFrame/4.10.2-GCCcore-15.2.0-no-analytics/20260831_123624UTC/easybuild/reprod/easyblocks/*.py