diff --git a/k8s/flux.cue b/k8s/flux.cue
index 556da731b..dfc48e463 100644
--- a/k8s/flux.cue
+++ b/k8s/flux.cue
@@ -63,6 +63,21 @@ bundle: {
 						name:      "gateway"
 						namespace: "codebattle"
 					}
+				}, {
+					patch: [{
+						op:   "add"
+						path: "/spec/template/spec/containers/0/env/-"
+						value: {
+							name:  "CODEBATTLE_HOSTNAME"
+							value: _hostname
+						}
+					}]
+					target: {
+						group:     "apps"
+						kind:      "Deployment"
+						name:      "codebattle"
+						namespace: "codebattle"
+					}
 				}]
 			}
 		}
diff --git a/k8s/timoni/codebattle/templates/config.cue b/k8s/timoni/codebattle/templates/config.cue
index 574f8da49..70b56fa6e 100644
--- a/k8s/timoni/codebattle/templates/config.cue
+++ b/k8s/timoni/codebattle/templates/config.cue
@@ -72,6 +72,8 @@ import (
 	}
 
 	certManager: enable: *false | bool
+
+	rustExecutor: *false | bool
 }
 
 // Instance takes the config values and outputs the Kubernetes objects.
diff --git a/k8s/timoni/codebattle/templates/deployment.cue b/k8s/timoni/codebattle/templates/deployment.cue
index eab2a8761..039912141 100644
--- a/k8s/timoni/codebattle/templates/deployment.cue
+++ b/k8s/timoni/codebattle/templates/deployment.cue
@@ -50,6 +50,9 @@ import (
 					}, {
 						name: "KUBERNETES_NAMESPACE"
 						valueFrom: fieldRef: fieldPath: "metadata.namespace"
+					}, if #config.rustExecutor {
+						name:  "CODEBATTLE_EXECUTOR"
+						value: "rust"
 					}]
 				}, {
 					name:            "nginx"
diff --git a/k8s/timoni/values.cue b/k8s/timoni/values.cue
index e76c6767d..542aee640 100644
--- a/k8s/timoni/values.cue
+++ b/k8s/timoni/values.cue
@@ -4,4 +4,5 @@ codebattleValues: {
 		gatewayName: "gateway"
 	}
 	certManager: enable: true
+	rustExecutor: true
 }