diff --git a/ci/demo-job.tpl.nomad b/ci/demo-job.tpl.nomad
index 7dcf20e..5e7f53a 100644
--- a/ci/demo-job.tpl.nomad
+++ b/ci/demo-job.tpl.nomad
@@ -5,7 +5,7 @@ job "python" {
   type = "batch"
   namespace = "${NOMAD_NAMESPACE}"
 
-  group "python-group" {
+  group "default-group" {
     ephemeral_disk {
       migrate = false
       size    = 10
diff --git a/environment/job.go b/environment/job.go
index 1850b4c..ba8642a 100644
--- a/environment/job.go
+++ b/environment/job.go
@@ -3,7 +3,6 @@ package environment
 import (
 	"context"
 	_ "embed"
-	"fmt"
 	nomadApi "github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/jobspec2"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad"
@@ -12,8 +11,6 @@ import (
 
 const (
 	DefaultTaskDriver = "docker"
-	TaskNameFormat    = "%s-task"
-	TaskName          = "python-job-task"
 )
 
 // defaultJobHCL holds our default job in HCL format.
@@ -50,8 +47,8 @@ func createJob(
 	job.ID = &id
 	job.Name = &id
 
-	var taskGroup = createTaskGroup(&job, fmt.Sprintf(nomad.TaskGroupNameFormat, id), prewarmingPoolSize)
-	configureTask(taskGroup, fmt.Sprintf(TaskNameFormat, id), cpuLimit, memoryLimit, image, networkAccess, exposedPorts)
+	var taskGroup = createTaskGroup(&job, nomad.TaskGroupName, prewarmingPoolSize)
+	configureTask(taskGroup, nomad.TaskName, cpuLimit, memoryLimit, image, networkAccess, exposedPorts)
 
 	return &job
 }
diff --git a/environment/job_test.go b/environment/job_test.go
index b54ad12..8223e17 100644
--- a/environment/job_test.go
+++ b/environment/job_test.go
@@ -55,13 +55,13 @@ func createTestJob() (*nomadApi.Job, *nomadApi.Job) {
 	base := nomadApi.NewBatchJob("python-job", "python-job", "region-name", 100)
 	job := nomadApi.NewBatchJob("python-job", "python-job", "region-name", 100)
 	task := createTestTask()
-	task.Name = TaskName
+	task.Name = nomad.TaskName
 	image := "python:latest"
 	task.Config = map[string]interface{}{"image": image}
 	task.Config["network_mode"] = "none"
 	task.Resources = createTestResources()
 	taskGroup := createTestTaskGroup()
-	taskGroupName := fmt.Sprintf(nomad.TaskGroupNameFormat, *job.ID)
+	taskGroupName := nomad.TaskGroupName
 	taskGroup.Name = &taskGroupName
 	taskGroup.Tasks = []*nomadApi.Task{task}
 	taskGroup.Networks = []*nomadApi.NetworkResource{}
diff --git a/nomad/job.go b/nomad/job.go
index fb1be82..7570404 100644
--- a/nomad/job.go
+++ b/nomad/job.go
@@ -1,13 +1,12 @@
 package nomad
 
 import (
-	"fmt"
 	nomadApi "github.com/hashicorp/nomad/api"
 )
 
 const (
-	TaskGroupNameFormat = "%s-group"
-	TaskName            = "default-task"
+	TaskGroupName = "default-group"
+	TaskName      = "default-task"
 )
 
 // LoadJobList loads the list of jobs from the Nomad api.
@@ -23,13 +22,13 @@ func (nc *nomadAPIClient) JobScale(jobID string) (jobScale uint, err error) {
 		return
 	}
 	// ToDo: Consider counting also the placed and desired allocations
-	jobScale = uint(status.TaskGroups[fmt.Sprintf(TaskGroupNameFormat, jobID)].Running)
+	jobScale = uint(status.TaskGroups[TaskGroupName].Running)
 	return
 }
 
 // SetJobScale sets the scaling count of the passed job to Nomad.
 func (nc *nomadAPIClient) SetJobScale(jobID string, count uint, reason string) (err error) {
 	intCount := int(count)
-	_, _, err = nc.client.Jobs().Scale(jobID, fmt.Sprintf(TaskGroupNameFormat, jobID), &intCount, reason, false, nil, nil)
+	_, _, err = nc.client.Jobs().Scale(jobID, TaskGroupName, &intCount, reason, false, nil, nil)
 	return
 }