diff --git a/values/headscale/values/values.yaml b/values/headscale/values/values.yaml
index ee4d1aac..4013123a 100644
--- a/values/headscale/values/values.yaml
+++ b/values/headscale/values/values.yaml
@@ -282,6 +282,8 @@ configMaps:
            { "name": "plume.data.oceanbox.io", "type": "A", "value": "10.255.241.99" },
            { "name": "slurm-agent.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },
 
+           { "name": "kueue.dev.tos.obx", "type": "A", "value": "10.255.241.99" },
+
            { "name": "slurm-agent.rossby.oceanbox.io", "type": "A", "value": "172.16.239.222" },
 
            { "name": "argocd.adm.vtn.obx", "type": "A", "value": "172.16.239.221" },
@@ -290,6 +292,8 @@ configMaps:
            { "name": "alertmanager.adm.vtn.obx", "type": "A", "value": "172.16.239.221" },
            { "name": "slurm-agent.adm.vtn.obx", "type": "A", "value": "172.16.239.221" },
 
+           { "name": "kueue.dev.vtn.obx", "type": "A", "value": "172.16.239.221" },
+
            { "name": "dashboard.ob-ceph.local", "type": "A", "value": "10.255.241.10" },
            { "name": "grafana.ob-ceph.local", "type": "A", "value": "10.255.241.10" },
            { "name": "s3.ob-ceph.local", "type": "A", "value": "10.255.241.10" },
diff --git a/values/kueue/manifests/clusterQueue.yaml b/values/kueue/manifests/clusterQueue.yaml
index 716ce700..5eab7b8d 100644
--- a/values/kueue/manifests/clusterQueue.yaml
+++ b/values/kueue/manifests/clusterQueue.yaml
@@ -1,12 +1,12 @@
 apiVersion: kueue.x-k8s.io/v1beta1
 kind: ResourceFlavor
 metadata:
- name: compute
+ name: compute # Just needs to exist, can be managed with tains/tolerations
 ---
 apiVersion: kueue.x-k8s.io/v1beta1
 kind: ClusterQueue
 metadata:
-   name: sample-jobs
+   name: jobs
 spec:
   cohort: general
   namespaceSelector: {} # Accept workloads from any namespace
@@ -19,3 +19,19 @@ spec:
              nominalQuota: '4'
            - name: "memory"
              nominalQuota: 8Gi
+---
+apiVersion: kueue.x-k8s.io/v1beta1
+kind: LocalQueue
+metadata:
+  name: prod-queue
+  namespace: prod-sorcerer
+spec:
+  clusterQueue: jobs
+---
+apiVersion: kueue.x-k8s.io/v1beta1
+kind: LocalQueue
+metadata:
+  name: staging-queue
+  namespace: staging-sorcerer
+spec:
+  clusterQueue: jobs
diff --git a/values/kueue/manifests/ing.yaml b/values/kueue/manifests/ing.yaml
new file mode 100644
index 00000000..1094ac3e
--- /dev/null
+++ b/values/kueue/manifests/ing.yaml
@@ -0,0 +1,65 @@
+{{- if eq .Values.clusterConfig.cluster "ekman"}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: kueueviz-ingress
+  namespace: kueue-system
+  annotations:
+    cert-manager.io/cluster-issuer: ca-issuer
+spec:
+  rules:
+    - host: kueue.dev.tos.obx
+      http:
+        paths:
+          - path: /api(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: kueue-kueueviz-backend
+                port:
+                  number: 8080
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: kueue-kueueviz-frontend
+                port:
+                  number: 8080
+  tls:
+    - hosts:
+        - kueue.dev.tos.obx
+      secretName: kueueviz-tls
+{{- end}}
+---
+{{- if eq .Values.clusterConfig.cluster "rossby"}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: kueueviz-ingress
+  namespace: kueue-system
+  annotations:
+    cert-manager.io/cluster-issuer: ca-issuer
+spec:
+  rules:
+    - host: kueue.dev.vtn.obx
+      http:
+        paths:
+          - path: /api(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: kueue-kueueviz-backend
+                port:
+                  number: 8080
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: kueue-kueueviz-frontend
+                port:
+                  number: 8080
+  tls:
+    - hosts:
+        - kueue.dev.vtn.obx
+      secretName: kueueviz-tls
+{{- end}}
diff --git a/values/kueue/values/values.yaml b/values/kueue/values/values.yaml
index 70bf2e1b..c9aeb7a6 100644
--- a/values/kueue/values/values.yaml
+++ b/values/kueue/values/values.yaml
@@ -12,14 +12,15 @@ controllerManager:
         frameworks:
           - batch/job
           - jobset.x-k8s.io/jobset
-
+      internalCertManagement:
+        enable: true
+enableCertManager: false
+enablePrometheus: true
+metrics:
+  prometheusNamespace: prometheus
 enableKueueViz: true
 kueueViz:
   backend:
     env:
       - name: KUEUEVIZ_ALLOWED_ORIGINS
         value: "http://frontend.kueueviz.local"
-  frontend:
-    env:
-      - name: REACT_APP_WEBSOCKET_URL
-        value: "wss://kueue-kueueviz-backend"
diff --git a/values/makai/values/values-staging.yaml b/values/makai/values/values-staging.yaml
index a0380467..35f72822 100644
--- a/values/makai/values/values-staging.yaml
+++ b/values/makai/values/values-staging.yaml
@@ -1,6 +1,6 @@
 replicaCount: 1
 image:
-  tag: "832fdf2d-debug"
+  tag: "52d23ede-debug"
 env:
   - name: APP_VERSION
     value: "0.0.0-staging"