diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33d6ff097cf05539b84b8997cac4c007f647db88..9a30bed773511495d52675aa4c10ef5af985249c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,12 +31,12 @@ variables:
       #   slurm_options: ["-c 36"]
       #   stack: ["pinot-noir"]
       #   app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
-      - environment: [kuma_h100]
+      - environment: [kuma-h100]
         slurm_options: ["-c 64 --reservation scitas"]
         stack: ["pinot-noir-gcc"]
         apptainer_options: ['--nv']
         app_image: ["registry.c4science.ch/scitas-stack/rhel9-kuma"]
-      - environment: [kuma_l40s]
+      - environment: [kuma-l40s]
         slurm_options: ["-c 64 --reservation scitas"]
         stack: ["pinot-noir-gcc"]
         apptainer_options: ['--nv']
diff --git a/ci/apptainer_by_hand.sh b/ci/apptainer_by_hand.sh
index 131cfbf819812501aae905eb20b14fa89530de88..3c78972734af7c7c0a0b7efbba7c90e2aad85c25 100755
--- a/ci/apptainer_by_hand.sh
+++ b/ci/apptainer_by_hand.sh
@@ -6,7 +6,7 @@ srun_options="-N1 -n1 -c 64 -p h100"
 apptainer_options="--nv"
 
 export stack=pinot-noir
-export environment=kuma_h100
+export environment=kuma-h100
 
 export SQUASHFS_ID=local
 export CI_PIPELINE_ID=1337
diff --git a/stacks/pinot-noir-gcc/config.json b/stacks/pinot-noir-gcc/config.json
index 530523f1986eaa170a83399cacdfa20fa1732a74..1066541f266774bb8cb8b21558aafae0d8c438df 100644
--- a/stacks/pinot-noir-gcc/config.json
+++ b/stacks/pinot-noir-gcc/config.json
@@ -37,8 +37,8 @@
             "helvetios": "skylake_avx512",
             "izar": "cascadelake",
             "jed": "icelake",
-            "kuma_l40s": "zen4",
-            "kuma_h100": "zen4"
+            "kuma-l40s": "zen4",
+            "kuma-h100": "zen4"
         },
         "compilers": {
             "gcc": {
diff --git a/stacks/pinot-noir-gcc/definitions_kuma_h100.yaml b/stacks/pinot-noir-gcc/definitions_kuma-h100.yaml
similarity index 100%
rename from stacks/pinot-noir-gcc/definitions_kuma_h100.yaml
rename to stacks/pinot-noir-gcc/definitions_kuma-h100.yaml
diff --git a/stacks/pinot-noir-gcc/definitions_kuma_l40s.yaml b/stacks/pinot-noir-gcc/definitions_kuma-l40s.yaml
similarity index 100%
rename from stacks/pinot-noir-gcc/definitions_kuma_l40s.yaml
rename to stacks/pinot-noir-gcc/definitions_kuma-l40s.yaml
diff --git a/stacks/pinot-noir-gcc/modules_kuma_h100.yaml b/stacks/pinot-noir-gcc/modules_kuma-h100.yaml
similarity index 100%
rename from stacks/pinot-noir-gcc/modules_kuma_h100.yaml
rename to stacks/pinot-noir-gcc/modules_kuma-h100.yaml
diff --git a/stacks/pinot-noir-gcc/modules_kuma_l40s.yaml b/stacks/pinot-noir-gcc/modules_kuma-l40s.yaml
similarity index 100%
rename from stacks/pinot-noir-gcc/modules_kuma_l40s.yaml
rename to stacks/pinot-noir-gcc/modules_kuma-l40s.yaml
diff --git a/stacks/pinot-noir-gcc/packages_kuma_h100.yaml b/stacks/pinot-noir-gcc/packages_kuma-h100.yaml
similarity index 100%
rename from stacks/pinot-noir-gcc/packages_kuma_h100.yaml
rename to stacks/pinot-noir-gcc/packages_kuma-h100.yaml
diff --git a/stacks/pinot-noir-gcc/packages_kuma_l40s.yaml b/stacks/pinot-noir-gcc/packages_kuma-l40s.yaml
similarity index 100%
rename from stacks/pinot-noir-gcc/packages_kuma_l40s.yaml
rename to stacks/pinot-noir-gcc/packages_kuma-l40s.yaml
diff --git a/stacks/pinot-noir/config.json b/stacks/pinot-noir/config.json
index e967be679a3152c59059927ecab727282477be8f..12fdda30869f050c2fe27a63b13410c50231f9ad 100644
--- a/stacks/pinot-noir/config.json
+++ b/stacks/pinot-noir/config.json
@@ -37,8 +37,8 @@
             "helvetios": "skylake_avx512",
             "izar": "cascadelake",
             "jed": "icelake",
-            "kuma_l40s": "zen4",
-            "kuma_h100": "zen4"
+            "kuma-l40s": "zen4",
+            "kuma-h100": "zen4"
         },
         "compilers": {
             "oneapi": {
diff --git a/stacks/pinot-noir/definitions_kuma_h100.yaml b/stacks/pinot-noir/definitions_kuma-h100.yaml
similarity index 100%
rename from stacks/pinot-noir/definitions_kuma_h100.yaml
rename to stacks/pinot-noir/definitions_kuma-h100.yaml
diff --git a/stacks/pinot-noir/definitions_kuma_l40s.yaml b/stacks/pinot-noir/definitions_kuma-l40s.yaml
similarity index 100%
rename from stacks/pinot-noir/definitions_kuma_l40s.yaml
rename to stacks/pinot-noir/definitions_kuma-l40s.yaml
diff --git a/stacks/pinot-noir/modules_kuma_h100.yaml b/stacks/pinot-noir/modules_kuma-h100.yaml
similarity index 100%
rename from stacks/pinot-noir/modules_kuma_h100.yaml
rename to stacks/pinot-noir/modules_kuma-h100.yaml
diff --git a/stacks/pinot-noir/modules_kuma_l40s.yaml b/stacks/pinot-noir/modules_kuma-l40s.yaml
similarity index 100%
rename from stacks/pinot-noir/modules_kuma_l40s.yaml
rename to stacks/pinot-noir/modules_kuma-l40s.yaml
diff --git a/stacks/pinot-noir/packages_kuma_h100.yaml b/stacks/pinot-noir/packages_kuma-h100.yaml
similarity index 100%
rename from stacks/pinot-noir/packages_kuma_h100.yaml
rename to stacks/pinot-noir/packages_kuma-h100.yaml
diff --git a/stacks/pinot-noir/packages_kuma_l40s.yaml b/stacks/pinot-noir/packages_kuma-l40s.yaml
similarity index 100%
rename from stacks/pinot-noir/packages_kuma_l40s.yaml
rename to stacks/pinot-noir/packages_kuma-l40s.yaml