diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 66ed692..588876e 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -52,6 +52,9 @@ jobs:
           export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
           cd /opt/gitea-runner/workspace/gooseek/backend/deploy/k8s
           
+          # Apply sandbox namespace separately (not managed by kustomize)
+          kubectl apply -f sandbox-namespace.yaml
+          
           kubectl apply -k .
           
           kubectl -n gooseek rollout restart deployment/api-gateway || true
diff --git a/backend/deploy/k8s/kustomization.yaml b/backend/deploy/k8s/kustomization.yaml
index e8ea93b..13d1292 100644
--- a/backend/deploy/k8s/kustomization.yaml
+++ b/backend/deploy/k8s/kustomization.yaml
@@ -26,9 +26,11 @@ resources:
   - opensandbox.yaml
   - ingress.yaml
 
-commonLabels:
-  app.kubernetes.io/part-of: gooseek
-  app.kubernetes.io/managed-by: kustomize
+labels:
+  - pairs:
+      app.kubernetes.io/part-of: gooseek
+      app.kubernetes.io/managed-by: kustomize
+    includeSelectors: false
 
 images:
   - name: gooseek/backend
diff --git a/backend/deploy/k8s/opensandbox.yaml b/backend/deploy/k8s/opensandbox.yaml
index 7f41a26..04dd1e0 100644
--- a/backend/deploy/k8s/opensandbox.yaml
+++ b/backend/deploy/k8s/opensandbox.yaml
@@ -1,12 +1,4 @@
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: gooseek-sandbox
-  labels:
-    app.kubernetes.io/part-of: gooseek
-    purpose: user-sandboxes
----
-apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: opensandbox-sa
diff --git a/backend/deploy/k8s/sandbox-namespace.yaml b/backend/deploy/k8s/sandbox-namespace.yaml
new file mode 100644
index 0000000..5190915
--- /dev/null
+++ b/backend/deploy/k8s/sandbox-namespace.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: gooseek-sandbox
+  labels:
+    app.kubernetes.io/part-of: gooseek
+    purpose: user-sandboxes