diff --git a/.env b/.env
index 8610fe2b..ae66b902 100644
--- a/.env
+++ b/.env
@@ -41,7 +41,8 @@ HTTP_PROXY=
 HTTPS_PROXY=
 SHUFFLE_PASS_WORKER_PROXY=TRUE
 SHUFFLE_PASS_APP_PROXY=FALSE
-TZ=Europe/Amsterdam 					#Timezone-handler in Orborus, Worker and Apps
+TZ=Europe/Amsterdam 					# Timezone-handler in Orborus, Worker and Apps
+ORBORUS_CONTAINER_NAME=				# Used to FIND the containername. cgroup v2: issue 501
 
 SHUFFLE_BASE_IMAGE_REGISTRY=ghcr.io
 SHUFFLE_BASE_IMAGE_NAME=frikky
diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh
index eb1d12db..3beae1f3 100644
--- a/functions/onprem/orborus/build.sh
+++ b/functions/onprem/orborus/build.sh
@@ -1,5 +1,5 @@
 NAME=shuffle-orborus
-VERSION=0.9.10
+VERSION=0.9.14
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index 7bc275d0..eb46a708 100644
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -56,7 +56,7 @@ var dockerApiVersion = os.Getenv("DOCKER_API_VERSION")
 var runningMode = strings.ToLower(os.Getenv("RUNNING_MODE"))
 var cleanupEnv = strings.ToLower(os.Getenv("CLEANUP"))
 var timezone = os.Getenv("TZ")
-var containerName = os.Getenv("CONTAINER_NAME")
+var containerName = os.Getenv("ORBORUS_CONTAINER_NAME")
 var executionIds = []string{}
 
 var dockercli *dockerclient.Client
diff --git a/functions/onprem/worker/build.sh b/functions/onprem/worker/build.sh
index b2f269c3..2dbd7f04 100644
--- a/functions/onprem/worker/build.sh
+++ b/functions/onprem/worker/build.sh
@@ -1,5 +1,5 @@
 NAME=shuffle-worker
-VERSION=0.9.13
+VERSION=0.9.14
 
 echo "Running docker build with $NAME:$VERSION"
 #CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin .