diff --git a/deployment.sh b/deployment.sh
index 0c51d37..f5f3667 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -44,6 +44,7 @@ CE_EDITION=false
 CARRIER_EDITION=false
 NGCP_INSTALLER=false
 PUPPET=''
+PUPPET_SERVER=puppet.mgm.sipwise.com
 RESTART_NETWORK=true
 INTERACTIVE=false
 DHCP=false
@@ -460,6 +461,10 @@ if checkBootParam "puppetenv" ; then
   PUPPET=$(getBootParam puppetenv)
 fi
 
+if checkBootParam "puppetserver" ; then
+  PUPPET_SERVER=$(getBootParam puppetserver)
+fi
+
 if checkBootParam "debianrelease" ; then
   DEBIAN_RELEASE=$(getBootParam debianrelease)
 fi
@@ -2150,7 +2155,7 @@ rundir=/var/run/puppet
 factpath=$vardir/lib/facter
 prerun_command=/etc/puppet/etckeeper-commit-pre
 postrun_command=/etc/puppet/etckeeper-commit-post
-server=puppet.mgm.sipwise.com
+server=${PUPPET_SERVER}
 
 [master]
 ssl_client_header=SSL_CLIENT_S_DN