diff --git a/compose.yml b/compose.yml
index 185d834..4e2bac1 100644
--- a/compose.yml
+++ b/compose.yml
@@ -41,6 +41,7 @@ services:
     volumes:
       - ./monerod/.bitmonero:/home/ubuntu/.bitmonero
   p2pool:
+    stop_grace_period: 1m # TODO reduce m_shutdownCountdown to reduce this
     restart: always
     build: p2pool/.
     entrypoint: ["/bin/sh", "/home/ubuntu/entry.sh"]
diff --git a/monerod/entry.sh b/monerod/entry.sh
index fddca2e..be29ffc 100644
--- a/monerod/entry.sh
+++ b/monerod/entry.sh
@@ -3,9 +3,9 @@
 # check bitmonero.log for log
 monero/monerod \
     --prune-blockchain \
-    --rpc-bind-ip 0.0.0.0 \
-    --confirm-external-bind \
-    --restricted-rpc \
+    --rpc-bind-port 18089 \
+    --rpc-restricted-bind-ip 0.0.0.0 \
+    --rpc-restricted-bind-port 18081 \
     --zmq-pub tcp://0.0.0.0:18083 \
     --out-peers 32 --in-peers 64 \
     --add-priority-node=p2pmd.xmrvsbeast.com:18080 \
@@ -15,7 +15,7 @@ monero/monerod \
     --detach
 
 cleanup() {
-    monero/monerod exit
+    monero/monerod exit --rpc-bind-port 18089
 }
 trap 'cleanup' TERM
 tail -f /dev/null &