diff --git a/docker/conpot/Dockerfile b/docker/conpot/Dockerfile
index 24d71f3a..a6f96008 100644
--- a/docker/conpot/Dockerfile
+++ b/docker/conpot/Dockerfile
@@ -4,7 +4,6 @@ FROM alpine:edge
 ADD dist/ /root/dist/
 #
 # Setup apt
-#RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
 RUN apk -U add \
              build-base \
              file \
@@ -17,18 +16,20 @@ RUN apk -U add \
              libxslt-dev \
              mariadb-dev \
              pkgconfig \
-	     py3-pip \
              python3 \
              python3-dev \
-             py-cffi \
-             py-cryptography \
+             py3-cffi \
+             py3-cryptography \
+	     py3-gevent \
+	     py3-pip \
              tcpdump \
              wget && \
 #
 # Setup ConPot
     git clone https://github.com/mushorg/conpot /opt/conpot && \
     cd /opt/conpot/ && \
-    git checkout ff09e009d10d953aa7dcff2c06b7c890e6ffd4b7 && \
+#    git checkout ff09e009d10d953aa7dcff2c06b7c890e6ffd4b7 && \
+    git checkout 804fd65aa3b7ffa31c07fd4e863d4a5500414cf3 && \
     # Change template default ports if <1024
     sed -i 's/port="2121"/port="21"/' /opt/conpot/conpot/templates/default/ftp/ftp.xml && \ 
     sed -i 's/port="8800"/port="80"/' /opt/conpot/conpot/templates/default/http/http.xml && \ 
diff --git a/docker/conpot/dist/templates/IEC104/template.xml b/docker/conpot/dist/templates/IEC104/template.xml
index 05c9074a..c5a19edc 100644
--- a/docker/conpot/dist/templates/IEC104/template.xml
+++ b/docker/conpot/dist/templates/IEC104/template.xml
@@ -347,6 +347,10 @@
 
 
             <!-- IEC104 Protocol parameter -->
+            <!-- Common (Object) Address, aka COA, Station Address -->
+            <key name="CommonAddress">
+                <value type="value">"0x1e28"</value>
+            </key>
             <!-- Timeout of connection establishment -->
             <key name="T_0">
                 <value type="value">30</value>