diff --git a/k8s/timoni/codebattle/templates/deployment.cue b/k8s/timoni/codebattle/templates/deployment.cue
index 0df7c9c9f..eab2a8761 100644
--- a/k8s/timoni/codebattle/templates/deployment.cue
+++ b/k8s/timoni/codebattle/templates/deployment.cue
@@ -47,6 +47,9 @@ import (
 					}, {
 						name:  "CODEBATTLE_VERSION"
 						value: #config.image.codebattle.tag
+					}, {
+						name: "KUBERNETES_NAMESPACE"
+						valueFrom: fieldRef: fieldPath: "metadata.namespace"
 					}]
 				}, {
 					name:            "nginx"
diff --git a/services/app/apps/codebattle/lib/codebattle/code_check/executor/remote_rust.ex b/services/app/apps/codebattle/lib/codebattle/code_check/executor/remote_rust.ex
index 6a4904f4a..73c2d22fb 100644
--- a/services/app/apps/codebattle/lib/codebattle/code_check/executor/remote_rust.ex
+++ b/services/app/apps/codebattle/lib/codebattle/code_check/executor/remote_rust.ex
@@ -100,5 +100,8 @@ defmodule Codebattle.CodeCheck.Executor.RemoteRust do
   end
 
   # defp runner_url(_lang), do: "http://localhost:4002/run"
-  defp runner_url(lang), do: "http://runner-#{lang}.default.svc/run"
+  defp runner_url(lang) do
+    namespace = Application.get_env(:codebattle, :k8s_namespace, "default")
+    "http://runner-#{lang}.#{namespace}.svc/run"
+  end
 end
diff --git a/services/app/config/config.exs b/services/app/config/config.exs
index 1090cd238..e609623ee 100644
--- a/services/app/config/config.exs
+++ b/services/app/config/config.exs
@@ -123,6 +123,8 @@ config :codebattle,
 config :codebattle,
   jitsi_api_key: System.get_env("JITSI_API_KEY", "")
 
+config :codebattle, k8s_namespace: System.get_env("KUBERNETES_NAMESPACE", "default")
+
 config :runner, :runner_url, "http://localhost:4001"
 config :runner, load_dot_env_file: true
 config :runner, pull_docker_images: false