diff --git a/Dockerfile b/Dockerfile
index bac3e2f6..a3cc326a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN \
       libssl-dev \
       libncurses-dev \
       doxygen \
-      libcurl4-openssl-dev \
+      ca-certificates \
     && \
     apt-get update -y && \
     apt-get install -y fish && \
@@ -28,12 +28,19 @@ WORKDIR /peerplays-core
 
 # Compile
 RUN \
+    ( git submodule sync --recursive || \
+      find `pwd`  -type f -name .git | \
+	while read f; do \
+	  rel="$(echo "${f#$PWD/}" | sed 's=[^/]*/=../=g')"; \
+	  sed -i "s=: .*/.git/=: $rel/=" "$f"; \
+	done && \
+      git submodule sync --recursive ) && \
     git submodule update --init --recursive && \
     cmake \
         -DCMAKE_BUILD_TYPE=Release \
         . && \
-    make witness_node && \
-    make install && \
+    make witness_node cli_wallet && \
+    install -s programs/witness_node/witness_node programs/cli_wallet/cli_wallet /usr/local/bin && \
     #
     # Obtain version
     mkdir /etc/peerplays && \
@@ -53,12 +60,15 @@ VOLUME ["/var/lib/peerplays", "/etc/peerplays"]
 # rpc service:
 EXPOSE 8090
 # p2p service:
-EXPOSE 2001
+EXPOSE 1776
 
 # default exec/config files
 ADD docker/default_config.ini /etc/peerplays/config.ini
 ADD docker/peerplaysentry.sh /usr/local/bin/peerplaysentry.sh
 RUN chmod a+x /usr/local/bin/peerplaysentry.sh
 
+# Make Docker send SIGINT instead of SIGTERM to the daemon
+STOPSIGNAL SIGINT
+
 # default execute entry
-CMD /usr/local/bin/peerplaysentry.sh
+CMD ["/usr/local/bin/peerplaysentry.sh"]