diff --git a/helmfile.d/kueue.yaml.gotmpl b/helmfile.d/kueue.yaml.gotmpl
index c3bcc3f8..3ffe53ae 100644
--- a/helmfile.d/kueue.yaml.gotmpl
+++ b/helmfile.d/kueue.yaml.gotmpl
@@ -1,8 +1,6 @@
 bases:
  - ../envs/environments.yaml.gotmpl
 
- 
-
 commonLabels:
   tier: system
 
@@ -14,6 +12,8 @@ releases:
   condition: kueue.enabled
   values:
   - ../values/kueue/values/values.yaml
+  - ../values/kueue/values/values-{{ .Environment.Name }}.yaml
+  - ../values/kueue/values/values-{{ .Environment.Name }}-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
   postRenderer: ../bin/kustomizer
   postRendererArgs:
   - ../values/kueue/kustomize/{{ .Environment.Name }}
diff --git a/values/kueue/values/values-ekman.yaml b/values/kueue/values/values-ekman.yaml
new file mode 100644
index 00000000..ae3c90ef
--- /dev/null
+++ b/values/kueue/values/values-ekman.yaml
@@ -0,0 +1,9 @@
+kueueViz:
+  backend:
+    env:
+      - name: KUEUEVIZ_ALLOWED_ORIGINS
+        value: "https://kueue.dev.tos.obx"
+  frontend:
+    env:
+      - name: REACT_APP_WEBSOCKET_URL
+        value: "wss://kueue.dev.tos.obx"
diff --git a/values/kueue/values/values-rossby.yaml b/values/kueue/values/values-rossby.yaml
new file mode 100644
index 00000000..31394214
--- /dev/null
+++ b/values/kueue/values/values-rossby.yaml
@@ -0,0 +1,9 @@
+kueueViz:
+  backend:
+    env:
+      - name: KUEUEVIZ_ALLOWED_ORIGINS
+        value: "https://kueue.dev.vtn.obx"
+  frontend:
+    env:
+      - name: REACT_APP_WEBSOCKET_URL
+        value: "wss://kueue.dev.vtn.obx"
diff --git a/values/kueue/values/values.yaml b/values/kueue/values/values.yaml
index 77c0a293..9fef86de 100644
--- a/values/kueue/values/values.yaml
+++ b/values/kueue/values/values.yaml
@@ -19,12 +19,3 @@ enablePrometheus: true
 metrics:
   prometheusNamespace: prometheus
 enableKueueViz: true
-kueueViz:
-  backend:
-    env:
-      - name: KUEUEVIZ_ALLOWED_ORIGINS
-        value: "https://frontend.kueueviz.local"
-  # frontend:
-    # env:
-      # - name: REACT_APP_WEBSOCKET_URL
-        # value: "wss://kueue-kueueviz-backend"