diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57891a136fa8ce280595d183ccffe3275681e13e..af5316914b5385da60b0ac7716476dac02925d5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,7 +165,7 @@ version:
 .build:
   rules:
     - when: on_success
-  resource_group: build
+  resource_group: ${CI_COMMIT_REF_NAME}
   ## Use docker runner for docker builds
   tags:
     - docker-new
@@ -293,7 +293,6 @@ jug_xl:default:
 #        BUILD_IMAGE: jug_xl_oneapi
   extends: .build
   stage: jug
-  resource_group: build
   needs:
     - version
     - jug_dev:default
@@ -389,6 +388,7 @@ jug_xl:feature:
 .singularity:
   stage: deploy
   interruptible: true
+  resource_group: ${CI_COMMIT_REF_NAME}
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never