diff --git a/docker/ciscoasa/Dockerfile b/docker/ciscoasa/Dockerfile
index f1f12938..21d455dd 100644
--- a/docker/ciscoasa/Dockerfile
+++ b/docker/ciscoasa/Dockerfile
@@ -35,4 +35,4 @@ RUN apk -U upgrade && \
 # Start elasticsearch-head
 WORKDIR /opt/ciscoasa_honeypot
 USER ciscoasa:ciscoasa
-CMD python3 asa_server.py --enable_ssl --verbose >> /var/log/ciscoasa/ciscoasa.log 2>&1
+CMD exec python3 asa_server.py --enable_ssl --verbose >> /var/log/ciscoasa/ciscoasa.log 2>&1
diff --git a/docker/ciscoasa/docker-compose.yml b/docker/ciscoasa/docker-compose.yml
index a2fcfa04..a87845a7 100644
--- a/docker/ciscoasa/docker-compose.yml
+++ b/docker/ciscoasa/docker-compose.yml
@@ -12,6 +12,7 @@ services:
     build: .
     container_name: ciscoasa
     restart: always
+    stop_signal: SIGINT
     networks:
      - ciscoasa_local
     ports:
diff --git a/docker/conpot/Dockerfile b/docker/conpot/Dockerfile
index e2d9d49d..263f8673 100644
--- a/docker/conpot/Dockerfile
+++ b/docker/conpot/Dockerfile
@@ -21,6 +21,7 @@ RUN apk -U --no-cache add bash \
                python-dev \
                py-cffi \
                py-cryptography \
+               py-pip \
                tcpdump \
                wget && \
 
@@ -31,6 +32,7 @@ RUN apk -U --no-cache add bash \
     cp /root/dist/requirements.txt /opt/conpot/ && \
     # Patch to accept ENV for MIB path
     cp /root/dist/snmp_server.py /opt/conpot/conpot/protocols/snmp/ && \
+    pip install -U pip setuptools && \
     python setup.py install && \
     cd / && \
     # Monkey patch, see https://github.com/mushorg/conpot/issues/361
@@ -64,4 +66,4 @@ RUN apk -U --no-cache add bash \
     rm -rf /var/cache/apk/*
 
 # Start conpot
-CMD /usr/bin/conpot --template $CONPOT_TEMPLATE --logfile $CONPOT_LOG --config $CONPOT_CONFIG
+CMD exec /usr/bin/conpot --template $CONPOT_TEMPLATE --logfile $CONPOT_LOG --config $CONPOT_CONFIG
diff --git a/docker/conpot/docker-compose.yml b/docker/conpot/docker-compose.yml
index 0271583e..feb9bb50 100644
--- a/docker/conpot/docker-compose.yml
+++ b/docker/conpot/docker-compose.yml
@@ -15,6 +15,7 @@ services:
     build: .
     container_name: conpot_default
     restart: always
+    stop_signal: SIGINT
     environment:
      - CONPOT_CONFIG=/etc/conpot/conpot.cfg
      - CONPOT_JSON_LOG=/var/log/conpot/conpot_default.json
@@ -44,6 +45,7 @@ services:
     build: .
     container_name: conpot_IEC104
     restart: always
+    stop_signal: SIGINT
     environment:
      - CONPOT_CONFIG=/etc/conpot/conpot.cfg
      - CONPOT_JSON_LOG=/var/log/conpot/conpot_IEC104.json
@@ -68,6 +70,7 @@ services:
     build: .
     container_name: conpot_guardian_ast
     restart: always
+    stop_signal: SIGINT
     environment:
      - CONPOT_CONFIG=/etc/conpot/conpot.cfg
      - CONPOT_JSON_LOG=/var/log/conpot/conpot_guardian_ast.json
@@ -91,6 +94,7 @@ services:
     build: .
     container_name: conpot_ipmi
     restart: always
+    stop_signal: SIGINT
     environment:
      - CONPOT_CONFIG=/etc/conpot/conpot.cfg
      - CONPOT_JSON_LOG=/var/log/conpot/conpot_ipmi.json
@@ -114,6 +118,7 @@ services:
     build: .
     container_name: conpot_kamstrup_382
     restart: always
+    stop_signal: SIGINT
     environment:
      - CONPOT_CONFIG=/etc/conpot/conpot.cfg
      - CONPOT_JSON_LOG=/var/log/conpot/conpot_kamstrup_382.json
diff --git a/docker/elasticpot/docker-compose.yml b/docker/elasticpot/docker-compose.yml
index c8674abd..a2dce37c 100644
--- a/docker/elasticpot/docker-compose.yml
+++ b/docker/elasticpot/docker-compose.yml
@@ -10,6 +10,7 @@ services:
     build: .
     container_name: elasticpot
     restart: always
+    stop_signal: SIGINT
     networks:
      - elasticpot_local
     ports:
diff --git a/docker/elk/kibana/docker-compose.yml b/docker/elk/kibana/docker-compose.yml
index fcae008f..ca13a645 100644
--- a/docker/elk/kibana/docker-compose.yml
+++ b/docker/elk/kibana/docker-compose.yml
@@ -9,6 +9,7 @@ services:
     build: .
     container_name: kibana
     restart: always
+    stop_signal: SIGKILL
 #    depends_on:
 #      elasticsearch:
 #        condition: service_healthy
diff --git a/docker/ews/Dockerfile b/docker/ews/Dockerfile
index d4023f18..32f495b7 100644
--- a/docker/ews/Dockerfile
+++ b/docker/ews/Dockerfile
@@ -47,4 +47,4 @@ RUN apk -U upgrade && \
 
 # Run ewsposter
 USER ews:ews
-CMD sleep 10 && /usr/bin/python /opt/ewsposter/ews.py -l 60
+CMD sleep 10 && exec /usr/bin/python /opt/ewsposter/ews.py -l 60
diff --git a/docker/ews/docker-compose.yml b/docker/ews/docker-compose.yml
index 54145ed5..4d746dfb 100644
--- a/docker/ews/docker-compose.yml
+++ b/docker/ews/docker-compose.yml
@@ -12,6 +12,7 @@ services:
     build: .
     container_name: ewsposter
     restart: always
+    stop_signal: SIGINT
     networks:
      - ewsposter_local
     env_file: