diff --git a/lib/ood_core/job/adapters/kubernetes/batch.rb b/lib/ood_core/job/adapters/kubernetes/batch.rb
index 795c5e00..a2106ddb 100644
--- a/lib/ood_core/job/adapters/kubernetes/batch.rb
+++ b/lib/ood_core/job/adapters/kubernetes/batch.rb
@@ -271,7 +271,7 @@ def configmap_name(id)
   end
 
   def namespace
-    "#{namespace_prefix}#{username}"
+    "#{namespace_prefix}#{username.gsub(/[.@]/, '-')}"
   end
 
   def formatted_ns_cmd