diff --git a/challenge-toolkit b/challenge-toolkit
index 38b0360..c7cac9c 160000
--- a/challenge-toolkit
+++ b/challenge-toolkit
@@ -1 +1 @@
-Subproject commit 38b03600b49b24180dae1aa66913664018c7a35a
+Subproject commit c7cac9cab65c5d2870d7cbf0efb56deb00d222e7
diff --git a/challenges/forensics/oh-look-a-flag/k8s/config/Chart.yaml b/challenges/forensics/oh-look-a-flag/k8s/config/Chart.yaml
index 0dba00f..8d12ed5 100644
--- a/challenges/forensics/oh-look-a-flag/k8s/config/Chart.yaml
+++ b/challenges/forensics/oh-look-a-flag/k8s/config/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: configmap-oh-look-a-flag
-version: 1.6.0
+version: 1.7.0
 description: Challenge configmap for oh-look-a-flag in category forensics
-appVersion: "1.6.0"
+appVersion: "1.7.0"
 type: application
diff --git a/challenges/forensics/oh-look-a-flag/k8s/config/templates/k8s.yml b/challenges/forensics/oh-look-a-flag/k8s/config/templates/k8s.yml
index 561e4a5..3b0f257 100644
--- a/challenges/forensics/oh-look-a-flag/k8s/config/templates/k8s.yml
+++ b/challenges/forensics/oh-look-a-flag/k8s/config/templates/k8s.yml
@@ -6,7 +6,7 @@ metadata:
     challenges.ctfpilot.com/type: "none"
     challenges.ctfpilot.com/name: "oh-look-a-flag"
     challenges.ctfpilot.com/category: "forensics"
-    challenges.ctfpilot.com/version: "6"
+    challenges.ctfpilot.com/version: "7"
     challenges.ctfpilot.com/configmap: "challenge-config"
     challenges.ctfpilot.com/enabled: "true"
     ctfpilot.com/component: "challenge-config"
@@ -14,7 +14,7 @@ data:
   name: "oh-look-a-flag"
   path: "challenges/forensics/oh-look-a-flag"
   repository: "ctfpilot/challenges-example"
-  generated_at: "2025-12-20 15:56:40"
+  generated_at: "2025-12-20 17:57:38"
   challenge: |
     {
       "$schema": "https://raw.githubusercontent.com/ctfpilot/challenge-schema/refs/heads/main/schema.json",
diff --git a/challenges/forensics/oh-look-a-flag/k8s/config/values.yaml b/challenges/forensics/oh-look-a-flag/k8s/config/values.yaml
index 26ee7ec..0f40fb4 100644
--- a/challenges/forensics/oh-look-a-flag/k8s/config/values.yaml
+++ b/challenges/forensics/oh-look-a-flag/k8s/config/values.yaml
@@ -3,7 +3,7 @@ challenge:
   name: oh-look-a-flag
   category: forensics
   type: none
-  version: 6
+  version: 7
   path: challenges/forensics/oh-look-a-flag
 kubectf:
   expires: 3600
diff --git a/challenges/forensics/oh-look-a-flag/k8s/files/forensics_oh-look-a-flag.zip b/challenges/forensics/oh-look-a-flag/k8s/files/forensics_oh-look-a-flag.zip
index 3dcf907..07262b0 100644
Binary files a/challenges/forensics/oh-look-a-flag/k8s/files/forensics_oh-look-a-flag.zip and b/challenges/forensics/oh-look-a-flag/k8s/files/forensics_oh-look-a-flag.zip differ
diff --git a/challenges/forensics/oh-look-a-flag/version b/challenges/forensics/oh-look-a-flag/version
index 62f9457..c793025 100644
--- a/challenges/forensics/oh-look-a-flag/version
+++ b/challenges/forensics/oh-look-a-flag/version
@@ -1 +1 @@
-6
\ No newline at end of file
+7
\ No newline at end of file
diff --git a/challenges/web/the-shared-site/k8s/challenge/templates/k8s.yml b/challenges/web/the-shared-site/k8s/challenge/templates/k8s.yml
index e39bb83..3281e7d 100644
--- a/challenges/web/the-shared-site/k8s/challenge/templates/k8s.yml
+++ b/challenges/web/the-shared-site/k8s/challenge/templates/k8s.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "ctf-web-the-shared-site"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "web"
     challenges.ctfpilot.com/name: "the-shared-site"
@@ -76,7 +76,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: "ctf-web-the-shared-site"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "web"
     challenges.ctfpilot.com/name: "the-shared-site"
@@ -95,7 +95,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: "ingress-ctf-web-the-shared-site"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "web"
     challenges.ctfpilot.com/name: "the-shared-site"
diff --git a/challenges/web/the-shared-site/k8s/config/templates/k8s.yml b/challenges/web/the-shared-site/k8s/config/templates/k8s.yml
index 83c7e5f..79e55e8 100644
--- a/challenges/web/the-shared-site/k8s/config/templates/k8s.yml
+++ b/challenges/web/the-shared-site/k8s/config/templates/k8s.yml
@@ -14,7 +14,7 @@ data:
   name: "the-shared-site"
   path: "challenges/web/the-shared-site"
   repository: "ctfpilot/challenges-example"
-  generated_at: "2025-12-20 15:57:00"
+  generated_at: "2025-12-20 17:54:27"
   challenge: |
     {
       "$schema": "https://raw.githubusercontent.com/ctfpilot/challenge-schema/refs/heads/main/schema.json",
diff --git a/challenges/web/the-shared-site/template/k8s.yml b/challenges/web/the-shared-site/template/k8s.yml
index f64c276..90b83e6 100644
--- a/challenges/web/the-shared-site/template/k8s.yml
+++ b/challenges/web/the-shared-site/template/k8s.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -76,7 +76,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: "ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -95,7 +95,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: "ingress-ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
diff --git a/challenges/web/where-robots-cannot-search/k8s/challenge/k8s.yml b/challenges/web/where-robots-cannot-search/k8s/challenge/k8s.yml
index 9bcc839..4aa5dfa 100644
--- a/challenges/web/where-robots-cannot-search/k8s/challenge/k8s.yml
+++ b/challenges/web/where-robots-cannot-search/k8s/challenge/k8s.yml
@@ -16,7 +16,7 @@ spec:
     kind: Deployment
     metadata:
       name: "ctf-{{ deployment_id }}"
-      namespace: kubectf-challenges-instanced
+      namespace: ctfpilot-challenges-instanced
       labels:
         challenges.ctfpilot.com/type: "web"
         challenges.ctfpilot.com/name: "where-robots-cannot-search"
@@ -96,7 +96,7 @@ spec:
     kind: Service
     metadata:
       name: "ctf-{{ deployment_id }}"
-      namespace: kubectf-challenges-instanced
+      namespace: ctfpilot-challenges-instanced
       labels:
         challenges.ctfpilot.com/type: "web"
         challenges.ctfpilot.com/name: "where-robots-cannot-search"
@@ -118,7 +118,7 @@ spec:
     kind: Ingress
     metadata:
       name: ingress-ctf-{{ deployment_id }}
-      namespace: kubectf-challenges-instanced
+      namespace: ctfpilot-challenges-instanced
       labels:
         challenges.ctfpilot.com/type: "web"
         challenges.ctfpilot.com/name: "where-robots-cannot-search"
diff --git a/challenges/web/where-robots-cannot-search/k8s/config/templates/k8s.yml b/challenges/web/where-robots-cannot-search/k8s/config/templates/k8s.yml
index dceda6d..c4146aa 100644
--- a/challenges/web/where-robots-cannot-search/k8s/config/templates/k8s.yml
+++ b/challenges/web/where-robots-cannot-search/k8s/config/templates/k8s.yml
@@ -14,7 +14,7 @@ data:
   name: "where-robots-cannot-search"
   path: "challenges/web/where-robots-cannot-search"
   repository: "ctfpilot/challenges-example"
-  generated_at: "2025-12-20 15:56:58"
+  generated_at: "2025-12-20 17:54:17"
   challenge: |
     {
       "$schema": "https://raw.githubusercontent.com/ctfpilot/challenge-schema/refs/heads/main/schema.json",
diff --git a/challenges/web/where-robots-cannot-search/template/k8s.yml b/challenges/web/where-robots-cannot-search/template/k8s.yml
index 51cdafe..8ddc61f 100644
--- a/challenges/web/where-robots-cannot-search/template/k8s.yml
+++ b/challenges/web/where-robots-cannot-search/template/k8s.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "ctf-{{ deployment_id }}"
-  namespace: kubectf-challenges-instanced
+  namespace: ctfpilot-challenges-instanced
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -82,7 +82,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: "ctf-{{ deployment_id }}"
-  namespace: kubectf-challenges-instanced
+  namespace: ctfpilot-challenges-instanced
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -104,7 +104,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: ingress-ctf-{{ deployment_id }}
-  namespace: kubectf-challenges-instanced
+  namespace: ctfpilot-challenges-instanced
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
diff --git a/template/instanced-tcp-k8s.yml b/template/instanced-tcp-k8s.yml
index 03c4634..f55c8c6 100644
--- a/template/instanced-tcp-k8s.yml
+++ b/template/instanced-tcp-k8s.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "ctf-{{ deployment_id }}"
-  namespace: kubectf-challenges-instanced
+  namespace: ctfpilot-challenges-instanced
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -70,7 +70,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: "ctf-{{ deployment_id }}"
-  namespace: kubectf-challenges-instanced
+  namespace: ctfpilot-challenges-instanced
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -93,7 +93,7 @@ apiVersion: traefik.io/v1alpha1
 kind: IngressRouteTCP
 metadata:
   name: "ingress-ctf-{{ deployment_id }}"
-  namespace: kubectf-challenges-instanced
+  namespace: ctfpilot-challenges-instanced
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
diff --git a/template/instanced-web-k8s.yml b/template/instanced-web-k8s.yml
index 51cdafe..8ddc61f 100644
--- a/template/instanced-web-k8s.yml
+++ b/template/instanced-web-k8s.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "ctf-{{ deployment_id }}"
-  namespace: kubectf-challenges-instanced
+  namespace: ctfpilot-challenges-instanced
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -82,7 +82,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: "ctf-{{ deployment_id }}"
-  namespace: kubectf-challenges-instanced
+  namespace: ctfpilot-challenges-instanced
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -104,7 +104,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: ingress-ctf-{{ deployment_id }}
-  namespace: kubectf-challenges-instanced
+  namespace: ctfpilot-challenges-instanced
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
diff --git a/template/shared-tcp-k8s.yml b/template/shared-tcp-k8s.yml
index f7c920e..83ae3c3 100644
--- a/template/shared-tcp-k8s.yml
+++ b/template/shared-tcp-k8s.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -64,7 +64,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: "ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -84,7 +84,7 @@ apiVersion: traefik.io/v1alpha1
 kind: IngressRouteTCP
 metadata:
   name: "ingress-ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -100,7 +100,7 @@ spec:
       priority: 10
       middlewares:
         - name: challenge-ipwhitelist-tcp
-          namespace: kubectf-challenges
+          namespace: ctfpilot-challenges
       services:
         - name: "ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
           port: 8080
diff --git a/template/shared-web-k8s.yml b/template/shared-web-k8s.yml
index f64c276..90b83e6 100644
--- a/template/shared-web-k8s.yml
+++ b/template/shared-web-k8s.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -76,7 +76,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: "ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"
@@ -95,7 +95,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: "ingress-ctf-{{ CHALLENGE_CATEGORY }}-{{ CHALLENGE_NAME }}"
-  namespace: kubectf-challenges
+  namespace: ctfpilot-challenges
   labels:
     challenges.ctfpilot.com/type: "{{ CHALLENGE_TYPE }}"
     challenges.ctfpilot.com/name: "{{ CHALLENGE_NAME }}"