diff --git a/nuclio/build.py b/nuclio/build.py
index e553d1e..78e4b70 100644
--- a/nuclio/build.py
+++ b/nuclio/build.py
@@ -86,7 +86,7 @@ def build_file(filename='', name='', handler='', archive=False, project='',
     name = normalize_name(name or filebase)
     update_in(config, 'metadata.name', name)
     config = extend_config(config, spec, tag, filename)
-    set_handler(config, filebase, '' if kind else handler, ext)
+    set_handler(config, normalize_name(filebase), '' if kind else handler, ext)
 
     log = logger.info if verbose else logger.debug
     log('Code:\n{}'.format(code))
diff --git a/nuclio/utils.py b/nuclio/utils.py
index 151c5c3..632a38d 100644
--- a/nuclio/utils.py
+++ b/nuclio/utils.py
@@ -155,6 +155,7 @@ def normalize_name(name):
     # [a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?
     name = re.sub(r'\s+', '-', name)
     name = name.replace('_', '-')
+    name = name.replace('.', '')
     return name.lower()