diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index f8329920..d8801973 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -227,7 +227,7 @@ function install_mailpile {
       echo 'User=mailpile';
       echo 'Group=mailpile';
       echo "WorkingDirectory=/var/www/$MAILPILE_DOMAIN_NAME/mail";
-      echo "ExecStart=/var/www/$MAILPILE_DOMAIN_NAME/mail/mp --www=0.0.0.0:${MAILPILE_PORT} --wait";
+      echo "ExecStart=/var/www/$MAILPILE_DOMAIN_NAME/mail/mp --www=127.0.0.1:${MAILPILE_PORT} --wait";
       echo 'Restart=always';
       echo 'RestartSec=10';
       echo '';
diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index ae141a04..9a78a407 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -125,7 +125,7 @@ function matrix_nginx {
     matrix_nginx_site=/etc/nginx/sites-available/$MATRIX_DOMAIN_NAME
     if [[ $ONION_ONLY == "no" ]]; then
         { echo 'server {';
-          echo "  listen 0.0.0.0:443;";
+          echo "  listen 443;";
           echo "  server_name ${MATRIX_DOMAIN_NAME};";
           echo '';
           echo '  # Security'; } > $matrix_nginx_site
@@ -154,7 +154,7 @@ function matrix_nginx {
           echo '}';
           echo '';
           echo 'server {';
-          echo "  listen 0.0.0.0:${MATRIX_HTTP_PORT};";
+          echo "  listen ${MATRIX_HTTP_PORT};";
           echo "  server_name ${MATRIX_DOMAIN_NAME};";
           echo '';
           echo '  # Security'; } >> $matrix_nginx_site