diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 8bd162a..45e65e5 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,6 +1,8 @@
 # A container for PyBitmessage daemon
 FROM ubuntu:bionic-20220401
 
+SHELL ["/bin/bash", "-exo", "pipefail", "-c"]
+
 RUN apt-get update
 
 # Install dependencies
@@ -46,11 +48,15 @@ USER bitmessage
 RUN pybitmessage -t
 
 # Setup environment
-ENTRYPOINT sed -ie "s|\(apiinterface = \).*|\10\.0\.0\.0|g" keys.dat \
-	#&& sed -ie "s|\(apivariant = \).*|\1json|g" keys.dat \
-	&& sed -ie "s|\(apiusername = \).*|\1$BITMESSAGE_API_USER|g" keys.dat \
-	&& sed -ie "s|\(apipassword = \).*|\1$BITMESSAGE_API_PASSWORD|g" keys.dat \
-	&& exec pybitmessage -d
+CMD sed -i -e "s|\(apiinterface = \).*|\10\.0\.0\.0|g" \
+        #-e "s|\(apivariant = \).*|\1json|g" \
+        -e "s|\(apiusername = \).*|\1$BITMESSAGE_API_USER|g" \
+        -e "s|\(apipassword = \).*|\1$BITMESSAGE_API_PASSWORD|g" \
+        -e "s|\(apienabled = \).*|\1True|g" \
+        -e "s|\(ttl = \).*|\1172800|g" \
+        -e "s|\(upnp = \).*|\1False|g" \
+        -e "s|\(udp = \).*|\1False|g" keys.dat \
+        && exec pybitmessage -d
 
 # Generate Deterministic address
 HEALTHCHECK --retries=3 --interval=15s \