diff --git a/deploy_stack.sh b/deploy_stack.sh
index 21f89188..4cbf8e3d 100755
--- a/deploy_stack.sh
+++ b/deploy_stack.sh
@@ -21,7 +21,7 @@ do
       export AUTH_URL=""
 			;;
     --help | -h)
-			echo "Usage: \n [default]\tdeploy the OpenFaaS core services\n --no-auth [-n]\tdisable basic authentication.\n --help\tdisplays this screen"
+			printf "Usage: \n [default]\tdeploy the OpenFaaS core services\n --no-auth [-n]\tdisable basic authentication.\n --help\tdisplays this screen"
       exit
 			;;
 	esac
@@ -35,9 +35,9 @@ secret=$(head -c 16 /dev/urandom| $sha_cmd | cut -d " " -f 1)
 echo "$secret" | docker secret create basic-auth-password -
 if [ $? = 0 ];
 then
-  echo "[Credentials]\n username: admin \n password: $secret\n echo -n "$secret" | faas-cli login --username=admin --password-stdin"
+  printf "[Credentials]\n username: admin \n password: $secret\n echo -n ""$secret"" | faas-cli login --username=admin --password-stdin"
 else
-  echo "[Credentials]\n already exist, not creating"
+  printf "[Credentials]\n already exist, not creating"
 fi
 
 if [ $BASIC_AUTH = "true" ];
diff --git a/gateway/Makefile b/gateway/Makefile
index 9a14f723..92bbbf4e 100644
--- a/gateway/Makefile
+++ b/gateway/Makefile
@@ -1,8 +1,9 @@
 .PHONY: all build push
 TAG?=latest
+NS?=openfaas
 
 all:	build
 build:
-	./build.sh ${TAG}
+	./build.sh ${TAG} ${NS}
 push:
-	./push.sh ${TAG}
+	./push.sh ${TAG} ${NS}
diff --git a/gateway/assets/index.html b/gateway/assets/index.html
index 40f7d12c..ddbfd8af 100644
--- a/gateway/assets/index.html
+++ b/gateway/assets/index.html
@@ -26,7 +26,7 @@
     <div layout="column" ng-cloak>
 
         <md-toolbar class="md-theme-indigo" hide-gt-sm>
-            <div class="md-toolbar-tools">
+            <div class="md-toolbar-tools no-pad">
                 <md-button ng-click="toggleSideNav()" class="md-icon-button" aria-label="Menu">
                     <md-icon md-svg-icon="img/icons/ic_menu_white.svg"></md-icon>
                 </md-button>
@@ -36,7 +36,7 @@
             <md-sidenav class="md-sidenav-left" md-component-id="left" md-is-locked-open="$mdMedia('gt-sm')" md-whiteframe="4" layout="column">
 
                 <md-toolbar class="md-theme-indigo">
-                    <div class="md-toolbar-tools">
+                    <div class="md-toolbar-tools no-pad">
                         <a href="https://www.openfaas.com/" target="_blank"><img src="icon.png" alt="OpenFaaS Icon" class="md-avatar" /></a>
                         <h1 style="flex: 1 1 auto;"><img src="img/logo-text.svg" class="md-logo"></h1>
                         <md-button ng-click="toggleSideNav()" class="md-icon-button" aria-label="Back" hide-gt-sm>
diff --git a/gateway/assets/style/bootstrap.css b/gateway/assets/style/bootstrap.css
index 7d2c1177..f65fbbb3 100644
--- a/gateway/assets/style/bootstrap.css
+++ b/gateway/assets/style/bootstrap.css
@@ -91,7 +91,7 @@ md-input-container .md-errors-spacer {
 }
 
 
-.md-toolbar-tools {
+.no-pad {
     padding: 0px 0px 0px 0px;
 }
 
diff --git a/gateway/build.sh b/gateway/build.sh
index 83924acd..76e5dbf5 100755
--- a/gateway/build.sh
+++ b/gateway/build.sh
@@ -29,7 +29,12 @@ if [ "$1" ] ; then
   fi
 fi
 
-NS=openfaas
+if [ "$2" ] ; then
+  NS=$2
+else
+  NS=openfaas
+fi
+
 
 echo "Building $NS/gateway:$eTAG with $dockerfile for $arch"
 
diff --git a/gateway/push.sh b/gateway/push.sh
index 119a11b8..5e86c2df 100755
--- a/gateway/push.sh
+++ b/gateway/push.sh
@@ -21,7 +21,14 @@ if [ "$1" ] ; then
   fi
 fi
 
-echo Pushing openfaas/gateway:$eTAG
 
-docker push openfaas/gateway:$eTAG
+if [ "$2" ] ; then
+  NS=$2
+else
+  NS=openfaas
+fi
+
+echo Pushing $NS/gateway:$eTAG
+
+docker push $NS/gateway:$eTAG