diff --git a/puppetserver/docker-entrypoint.d/55-set-masterport.sh b/puppetserver/docker-entrypoint.d/55-set-masterport.sh
index 9cabc88c..88a5d73b 100755
--- a/puppetserver/docker-entrypoint.d/55-set-masterport.sh
+++ b/puppetserver/docker-entrypoint.d/55-set-masterport.sh
@@ -9,7 +9,6 @@ hocon() {
 if test -n "$PUPPETSERVER_PORT"; then
   cd /etc/puppetlabs/puppetserver/conf.d/
   hocon -f webserver.conf set webserver.ssl-port $PUPPETSERVER_PORT
-  cd /etc/puppetlabs/puppet/
-  hocon -f puppet.conf set serverport $PUPPETSERVER_PORT
   cd /
+  puppet config set serverport $PUPPETSERVER_PORT --section main
 fi