diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
new file mode 100644
index 0000000000..e7fc9fdf76
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
@@ -0,0 +1,5 @@
+easyconfigs:
+  - waLBerla-6.1-foss-2023a-CUDA-12.1.1.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21601
+        from-commit: b2295ce4b662851c3b387f945e4b5ac80cb00d42
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml
index f6195d9357..19d9aedfae 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml
@@ -5,7 +5,3 @@ easyconfigs:
         from-commit: 6cbfbd7d7a55dc7243f46d0beea510278f4718df
         # see https://github.com/easybuilders/easybuild-easyblocks/pull/3467
         include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601
-  - waLBerla-6.1-foss-2023a-CUDA-12.1.1.eb:
-      options: 
-        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21601
-        from-commit: b2295ce4b662851c3b387f945e4b5ac80cb00d42