diff --git a/docker/cowrie/Dockerfile b/docker/cowrie/Dockerfile
index 7e801ec2..8b12e318 100644
--- a/docker/cowrie/Dockerfile
+++ b/docker/cowrie/Dockerfile
@@ -21,6 +21,7 @@ RUN apk --no-cache -U add \
 	     py3-bcrypt \
 	     py3-cryptography \
 	     py3-dateutil \
+	     py3-greenlet \
 	     py3-mysqlclient \
 	     py3-openssl \
 	     py3-packaging \
diff --git a/docker/ddospot/Dockerfile b/docker/ddospot/Dockerfile
index 7657c72a..c76469b6 100644
--- a/docker/ddospot/Dockerfile
+++ b/docker/ddospot/Dockerfile
@@ -9,6 +9,7 @@ RUN apk --no-cache -U add \
              git \
 	     libcap \
 	     py3-colorama \
+	     py3-greenlet \
 	     py3-pip \
 	     py3-schedule \
 	     py3-sqlalchemy \
diff --git a/docker/dicompot/docker-compose.yml b/docker/dicompot/docker-compose.yml
index 284d5f5c..422a634b 100644
--- a/docker/dicompot/docker-compose.yml
+++ b/docker/dicompot/docker-compose.yml
@@ -13,8 +13,8 @@ services:
     build: .
     container_name: dicompot
     restart: always
-    cpu_count: 1
-    cpus: 0.25
+#    cpu_count: 1
+#    cpus: 0.25
     networks:
      - dicompot_local
     ports:
diff --git a/docker/elasticpot/Dockerfile b/docker/elasticpot/Dockerfile
index 2b836d8e..29a166cd 100644
--- a/docker/elasticpot/Dockerfile
+++ b/docker/elasticpot/Dockerfile
@@ -13,9 +13,18 @@ RUN apk -U --no-cache add \
              openssl-dev \
 	     postgresql-dev \
              py3-cryptography \
+	     py3-elasticsearch \
+	     py3-geoip2 \
+	     py3-maxminddb \
              py3-mysqlclient \
+	     py3-packaging \
+	     py3-psycopg2 \
+	     py3-redis \
              py3-requests \
+	     py3-service_identity \
+	     py3-setuptools \
 	     py3-pip \
+	     py3-twisted \
              python3 \
              python3-dev && \
     mkdir -p /opt && \
@@ -23,7 +32,7 @@ RUN apk -U --no-cache add \
     git clone https://gitlab.com/bontchev/elasticpot.git/ && \
     cd elasticpot && \
     git checkout d12649730d819bd78ea622361b6c65120173ad45 && \
-    pip3 install --ignore-installed packaging && \
+    cp /root/dist/requirements.txt . && \
     pip3 install -r requirements.txt && \
 #
 # Setup user, groups and configs
diff --git a/docker/elasticpot/dist/requirements.txt b/docker/elasticpot/dist/requirements.txt
new file mode 100644
index 00000000..189bc74b
--- /dev/null
+++ b/docker/elasticpot/dist/requirements.txt
@@ -0,0 +1,6 @@
+configparser>=3.5.0
+couchdb
+hpfeeds>=3.0.0
+influxdb
+pymongo
+rethinkdb>=2.4
diff --git a/docker/elasticpot/docker-compose.yml b/docker/elasticpot/docker-compose.yml
index 62e827c0..cc60d632 100644
--- a/docker/elasticpot/docker-compose.yml
+++ b/docker/elasticpot/docker-compose.yml
@@ -10,8 +10,8 @@ services:
     build: .
     container_name: elasticpot
     restart: always
-    cpu_count: 1
-    cpus: 0.25
+#    cpu_count: 1
+#    cpus: 0.25
     networks:
      - elasticpot_local
     ports: