diff --git a/deploy/grafana-dashboard/queries/execution-duration-hist.flux b/deploy/grafana-dashboard/queries/execution-duration-hist.flux
index f66c141..aec0429 100644
--- a/deploy/grafana-dashboard/queries/execution-duration-hist.flux
+++ b/deploy/grafana-dashboard/queries/execution-duration-hist.flux
@@ -19,7 +19,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image", "_time"])
diff --git a/deploy/grafana-dashboard/queries/execution-duration.flux b/deploy/grafana-dashboard/queries/execution-duration.flux
index 8bfbcc2..4377f50 100644
--- a/deploy/grafana-dashboard/queries/execution-duration.flux
+++ b/deploy/grafana-dashboard/queries/execution-duration.flux
@@ -20,7 +20,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image"])
diff --git a/deploy/grafana-dashboard/queries/executions-per-minute-time.flux b/deploy/grafana-dashboard/queries/executions-per-minute-time.flux
index 27f65c6..5125056 100644
--- a/deploy/grafana-dashboard/queries/executions-per-minute-time.flux
+++ b/deploy/grafana-dashboard/queries/executions-per-minute-time.flux
@@ -19,7 +19,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image", "_time"])
diff --git a/deploy/grafana-dashboard/queries/executions-per-minute.flux b/deploy/grafana-dashboard/queries/executions-per-minute.flux
index 88567da..616dac2 100644
--- a/deploy/grafana-dashboard/queries/executions-per-minute.flux
+++ b/deploy/grafana-dashboard/queries/executions-per-minute.flux
@@ -20,7 +20,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: data, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image"])
diff --git a/deploy/grafana-dashboard/queries/executions-per-runner-hist.flux b/deploy/grafana-dashboard/queries/executions-per-runner-hist.flux
index ac00672..feb00e0 100644
--- a/deploy/grafana-dashboard/queries/executions-per-runner-hist.flux
+++ b/deploy/grafana-dashboard/queries/executions-per-runner-hist.flux
@@ -29,7 +29,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image", "_time"])
diff --git a/deploy/grafana-dashboard/queries/executions-per-runner.flux b/deploy/grafana-dashboard/queries/executions-per-runner.flux
index 83b08dd..507a558 100644
--- a/deploy/grafana-dashboard/queries/executions-per-runner.flux
+++ b/deploy/grafana-dashboard/queries/executions-per-runner.flux
@@ -29,7 +29,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image"])
diff --git a/deploy/grafana-dashboard/queries/idle-runner.flux b/deploy/grafana-dashboard/queries/idle-runner.flux
index 6afaf76..da05412 100644
--- a/deploy/grafana-dashboard/queries/idle-runner.flux
+++ b/deploy/grafana-dashboard/queries/idle-runner.flux
@@ -17,7 +17,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image", "_time"])
diff --git a/deploy/grafana-dashboard/queries/number-of-executions.flux b/deploy/grafana-dashboard/queries/number-of-executions.flux
index 810ca60..c2d75f0 100644
--- a/deploy/grafana-dashboard/queries/number-of-executions.flux
+++ b/deploy/grafana-dashboard/queries/number-of-executions.flux
@@ -18,7 +18,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image"])
diff --git a/deploy/grafana-dashboard/queries/prewarming-pool-size.flux b/deploy/grafana-dashboard/queries/prewarming-pool-size.flux
index 9742226..17fe472 100644
--- a/deploy/grafana-dashboard/queries/prewarming-pool-size.flux
+++ b/deploy/grafana-dashboard/queries/prewarming-pool-size.flux
@@ -17,7 +17,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image", "_time"])
diff --git a/deploy/grafana-dashboard/queries/request-body-size.flux b/deploy/grafana-dashboard/queries/request-body-size.flux
index b655763..811a90f 100644
--- a/deploy/grafana-dashboard/queries/request-body-size.flux
+++ b/deploy/grafana-dashboard/queries/request-body-size.flux
@@ -17,7 +17,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image", "_time"])
diff --git a/deploy/grafana-dashboard/queries/runner-per-minute.flux b/deploy/grafana-dashboard/queries/runner-per-minute.flux
index f1dc6d9..149dd61 100644
--- a/deploy/grafana-dashboard/queries/runner-per-minute.flux
+++ b/deploy/grafana-dashboard/queries/runner-per-minute.flux
@@ -21,7 +21,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image", "_time"])
diff --git a/deploy/grafana-dashboard/queries/runner-startup-duration.flux b/deploy/grafana-dashboard/queries/runner-startup-duration.flux
index cd3fa21..ce155fa 100644
--- a/deploy/grafana-dashboard/queries/runner-startup-duration.flux
+++ b/deploy/grafana-dashboard/queries/runner-startup-duration.flux
@@ -17,7 +17,7 @@ envMapping = from(bucket: "poseidon/autogen")
   |> last()
   |> keep(columns: ["id", "image", "stage"])
   |> rename(columns: {id: "environment_id"})
-  |> map(fn: (r) => ({ r with image: strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_") + "(" + strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + ")" }))
+  |> map(fn: (r) => ({ r with image: strings.substring(v: r.stage, start: 0, end: 1) + r.environment_id + "/" + strings.trimPrefix(v: r.image, prefix: "openhpi/co_execenv_")}))
 
 join(tables: {key1: result, key2: envMapping}, on: ["environment_id", "stage"], method: "inner")
   |> keep(columns: ["_value", "image", "_time"])