diff --git a/packer/jambonz-feature-server/scripts/install_app.sh b/packer/jambonz-feature-server/scripts/install_app.sh
index cda4316..88dfd0c 100755
--- a/packer/jambonz-feature-server/scripts/install_app.sh
+++ b/packer/jambonz-feature-server/scripts/install_app.sh
@@ -14,6 +14,3 @@ sudo -u admin bash -c "pm2 install pm2-logrotate"
 sudo -u admin bash -c "pm2 set pm2-logrotate:max_size 1G"
 sudo -u admin bash -c "pm2 set pm2-logrotate:retain 5"
 sudo -u admin bash -c "pm2 set pm2-logrotate:compress true"
-
-# add entries to /etc/crontab to start the app on reboot
-echo "@reboot admin /usr/bin/pm2 start /home/admin/apps/ecosystem.config.js" | sudo tee -a /etc/crontab
diff --git a/packer/jambonz-sbc-rtp/files/rtpengine.service b/packer/jambonz-sbc-rtp/files/rtpengine.service
index 9579f5d..db200a3 100644
--- a/packer/jambonz-sbc-rtp/files/rtpengine.service
+++ b/packer/jambonz-sbc-rtp/files/rtpengine.service
@@ -8,7 +8,9 @@ After=syslog.target network.target local-fs.target
 Type=forking
 ExecStartPre=/bin/sh -c 'systemctl set-environment LOCAL_IP=`curl -s http://169.254.169.254/latest/meta-data/local-ipv4`'
 ExecStartPre=/bin/sh -c 'systemctl set-environment PUBLIC_IP=`curl -s http://169.254.169.254/latest/meta-data/public-ipv4`'
-ExecStart=/usr/local/bin/rtpengine --interface ${LOCAL_IP}!${PUBLIC_IP} \
+ExecStart=/usr/local/bin/rtpengine \
+--interface private/${LOCAL_IP} \
+--interface public/${LOCAL_IP}!${PUBLIC_IP} \
 --listen-ng=22222 \
 --listen-udp=12222 \
 --listen-cli=127.0.0.1:9900 \
diff --git a/packer/jambonz-sbc-sip-rtp/files/rtpengine.service b/packer/jambonz-sbc-sip-rtp/files/rtpengine.service
index 9579f5d..db200a3 100644
--- a/packer/jambonz-sbc-sip-rtp/files/rtpengine.service
+++ b/packer/jambonz-sbc-sip-rtp/files/rtpengine.service
@@ -8,7 +8,9 @@ After=syslog.target network.target local-fs.target
 Type=forking
 ExecStartPre=/bin/sh -c 'systemctl set-environment LOCAL_IP=`curl -s http://169.254.169.254/latest/meta-data/local-ipv4`'
 ExecStartPre=/bin/sh -c 'systemctl set-environment PUBLIC_IP=`curl -s http://169.254.169.254/latest/meta-data/public-ipv4`'
-ExecStart=/usr/local/bin/rtpengine --interface ${LOCAL_IP}!${PUBLIC_IP} \
+ExecStart=/usr/local/bin/rtpengine \
+--interface private/${LOCAL_IP} \
+--interface public/${LOCAL_IP}!${PUBLIC_IP} \
 --listen-ng=22222 \
 --listen-udp=12222 \
 --listen-cli=127.0.0.1:9900 \
diff --git a/packer/jambonz-sbc-sip-rtp/scripts/install_app.sh b/packer/jambonz-sbc-sip-rtp/scripts/install_app.sh
index 1ca24b4..6ee404f 100755
--- a/packer/jambonz-sbc-sip-rtp/scripts/install_app.sh
+++ b/packer/jambonz-sbc-sip-rtp/scripts/install_app.sh
@@ -25,6 +25,3 @@ sudo -u admin bash -c "pm2 install pm2-logrotate"
 sudo -u admin bash -c "pm2 set pm2-logrotate:max_size 1G"
 sudo -u admin bash -c "pm2 set pm2-logrotate:retain 5"
 sudo -u admin bash -c "pm2 set pm2-logrotate:compress true"
-
-# add entries to /etc/crontab to start the app on reboot
-echo "@reboot admin /usr/bin/pm2 start /home/admin/apps/ecosystem.config.js" | sudo tee -a /etc/crontab
diff --git a/packer/jambonz-sbc-sip/scripts/install_app.sh b/packer/jambonz-sbc-sip/scripts/install_app.sh
index c962e1a..6ee404f 100755
--- a/packer/jambonz-sbc-sip/scripts/install_app.sh
+++ b/packer/jambonz-sbc-sip/scripts/install_app.sh
@@ -25,6 +25,3 @@ sudo -u admin bash -c "pm2 install pm2-logrotate"
 sudo -u admin bash -c "pm2 set pm2-logrotate:max_size 1G"
 sudo -u admin bash -c "pm2 set pm2-logrotate:retain 5"
 sudo -u admin bash -c "pm2 set pm2-logrotate:compress true"
-
-# add entries to /etc/crontab to start everything on reboot
-echo "@reboot admin /usr/bin/pm2 start /home/admin/apps/ecosystem.config.js" | sudo tee -a /etc/crontab
diff --git a/terraform/jambonz-devtest/feature-server.ecosystem.config.js.tmpl b/terraform/jambonz-devtest/feature-server.ecosystem.config.js.tmpl
index 3e334b2..1d98248 100644
--- a/terraform/jambonz-devtest/feature-server.ecosystem.config.js.tmpl
+++ b/terraform/jambonz-devtest/feature-server.ecosystem.config.js.tmpl
@@ -57,8 +57,10 @@ EOF
 
 echo "finished writing config file"
 
-sudo -u admin bash -c "pm2 delete /home/admin/apps/ecosystem.config.js"
 sudo -u admin bash -c "pm2 start /home/admin/apps/ecosystem.config.js"
+sudo env PATH=$PATH:/usr/bin /usr/lib/node_modules/pm2/bin/pm2 startup systemd -u admin --hp /home/admin
+sudo -u admin bash -c "pm2 save"
+sudo systemctl enable pm2-admin.service
 
 # install datadog if a datadog api key was provided
 if [ "${DATADOG_API_KEY}" ] ; then
diff --git a/terraform/jambonz-devtest/sbc-sip-rtp-server.ecosystem.config.js.tmpl b/terraform/jambonz-devtest/sbc-sip-rtp-server.ecosystem.config.js.tmpl
index eb14c31..b474605 100644
--- a/terraform/jambonz-devtest/sbc-sip-rtp-server.ecosystem.config.js.tmpl
+++ b/terraform/jambonz-devtest/sbc-sip-rtp-server.ecosystem.config.js.tmpl
@@ -166,9 +166,10 @@ EOF
 
 echo "finished writing config file"
 
-# restart everything because we've updated the ecosystem file
-sudo -u admin bash -c "pm2 delete /home/admin/apps/ecosystem.config.js"
 sudo -u admin bash -c "pm2 start /home/admin/apps/ecosystem.config.js"
+sudo env PATH=$PATH:/usr/bin /usr/lib/node_modules/pm2/bin/pm2 startup systemd -u admin --hp /home/admin
+sudo -u admin bash -c "pm2 save"
+sudo systemctl enable pm2-admin.service
 
 # install datadog if a datadog api key was provided
 if [ "${DATADOG_API_KEY}" ] ; then
diff --git a/terraform/jambonz-prod/feature-server.ecosystem.config.js.tmpl b/terraform/jambonz-prod/feature-server.ecosystem.config.js.tmpl
index 3e334b2..1d98248 100644
--- a/terraform/jambonz-prod/feature-server.ecosystem.config.js.tmpl
+++ b/terraform/jambonz-prod/feature-server.ecosystem.config.js.tmpl
@@ -57,8 +57,10 @@ EOF
 
 echo "finished writing config file"
 
-sudo -u admin bash -c "pm2 delete /home/admin/apps/ecosystem.config.js"
 sudo -u admin bash -c "pm2 start /home/admin/apps/ecosystem.config.js"
+sudo env PATH=$PATH:/usr/bin /usr/lib/node_modules/pm2/bin/pm2 startup systemd -u admin --hp /home/admin
+sudo -u admin bash -c "pm2 save"
+sudo systemctl enable pm2-admin.service
 
 # install datadog if a datadog api key was provided
 if [ "${DATADOG_API_KEY}" ] ; then
diff --git a/terraform/jambonz-prod/sbc-sip-server.ecosystem.config.js.tmpl b/terraform/jambonz-prod/sbc-sip-server.ecosystem.config.js.tmpl
index eb14c31..b474605 100644
--- a/terraform/jambonz-prod/sbc-sip-server.ecosystem.config.js.tmpl
+++ b/terraform/jambonz-prod/sbc-sip-server.ecosystem.config.js.tmpl
@@ -166,9 +166,10 @@ EOF
 
 echo "finished writing config file"
 
-# restart everything because we've updated the ecosystem file
-sudo -u admin bash -c "pm2 delete /home/admin/apps/ecosystem.config.js"
 sudo -u admin bash -c "pm2 start /home/admin/apps/ecosystem.config.js"
+sudo env PATH=$PATH:/usr/bin /usr/lib/node_modules/pm2/bin/pm2 startup systemd -u admin --hp /home/admin
+sudo -u admin bash -c "pm2 save"
+sudo systemctl enable pm2-admin.service
 
 # install datadog if a datadog api key was provided
 if [ "${DATADOG_API_KEY}" ] ; then