diff --git a/templates/clouds.libsonnet b/templates/clouds.libsonnet
index b54b7b373..a39d2b837 100644
--- a/templates/clouds.libsonnet
+++ b/templates/clouds.libsonnet
@@ -2,7 +2,7 @@
   kubernetes(cloudName, config, agents): {
     [cloudName]: {
       kind: "kubernetes",
-      namespace: config.kubernetes.agents.namespace, # should be changed to something agent-specific to fix #5
+      namespace: config.kubernetes.agents.namespace,
       podRetention: "never",
       templates: {
         [agentName]: agents[agentName].spec + agents[agentName].variants[config.jiroMaster.remoting.version] + {
diff --git a/templates/config.libsonnet b/templates/config.libsonnet
index 144a56c56..b3a8be45f 100644
--- a/templates/config.libsonnet
+++ b/templates/config.libsonnet
@@ -70,7 +70,7 @@ local clouds = import "clouds.libsonnet";
       }
     },
     agents: {
-      namespace: $.project.shortName,
+      namespace: $.kubernetes.master.namespace,  # should be changed to something agent-specific to fix #5
       defaultResources: {
         local Const = import "k8s/resource-packs.libsonnet",
         cpu: {