diff --git a/CEPTD/docker/suricata/Dockerfile b/CEPTD/docker/suricata/Dockerfile
index e3133e3..718f6c8 100644
--- a/CEPTD/docker/suricata/Dockerfile
+++ b/CEPTD/docker/suricata/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.12.0
 #
 # Include dist
 ADD dist/ /root/dist/
@@ -9,15 +9,20 @@ RUN apk -U --no-cache add \
                  curl \
                  file \
                  libcap \
-		 python3 \
-		 python3-dev \
-                 wget && \
+                 libnet \
+                 wget \
+                 python3 \
+                 python3-dev && \
+                 if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi && \
+                 python3 -m ensurepip && \
+                 rm -r /usr/lib/python*/ensurepip && \
+                 pip3 install --no-cache --upgrade pip setuptools wheel && \
+                 if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
 		 apk -U add --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
                  suricata && \
-		 pip3 install --no-cache-dir --upgrade pip && \
 #
 # Install python module
-    pip3 install sqlitedict && \
+    pip install sqlitedict && \
 #
 # Setup user, groups, configs and scripts
     addgroup -g 2000 suri && \
diff --git a/docker-compose.yml b/docker-compose.yml
index cff5410..4f1842c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
   suricata:
     build: 
       context: ./CEPTD/docker/suricata
+    image: datalabauth/kea-curex_suricata:v1.0.0
     container_name: curex-suricata
     restart: always
     network_mode: "host"
@@ -49,6 +50,7 @@ services:
   logstash:
     build: 
       context: ./CEPTD/docker/logstash
+    image: datalabauth/kea-curex_logstash:v1.0.0
     container_name: curex-logstash
     restart: always
     volumes:
@@ -97,6 +99,7 @@ services:
   od:
     build: 
       context: ./OD
+    image: datalabauth/kea-curex_od:v1.0.0
     container_name: curex-od
     depends_on:
       - timescaledb
@@ -108,6 +111,7 @@ services:
   mltd:
     build:
       context: ./MLTD
+    image: datalabauth/kea-curex_mltd:v1.0.0
     container_name: curex-mltd
     depends_on:
       - timescaledb