diff --git a/locust-distributed/Dockerfile b/locust-distributed/Dockerfile
index 918745f..2ee49af 100644
--- a/locust-distributed/Dockerfile
+++ b/locust-distributed/Dockerfile
@@ -1,16 +1,29 @@
-FROM locustio/locust:2.23.1
+FROM python:3.6-alpine
 
-LABEL org.opencontainers.image.source=https://github.com/base2Services/build-containers
+ARG LOCUST_VERSION="2.31.1"
+ENV LOCUST_VERSION $LOCUST_VERSION
 
-USER root
-RUN pip install awscli faker
+RUN apk --no-cache add \
+      --virtual=.build-dep \
+      build-base \
+      linux-headers \
+      zeromq-dev \
+      libffi-dev \
+    && apk --no-cache add \
+      libzmq \
+    && pip install --no-cache-dir \
+      locustio==${LOCUST_VERSION} \
+      awscli \
+      pyzmq \
+    && apk del .build-dep \
+    && mkdir /locust
+
+COPY docker-entrypoint.sh /
 
 WORKDIR /locust
 
 EXPOSE 8089 5557 5558
 
-ENTRYPOINT [ "/entrypoint" ]
-
-CMD [ "locust" ]
+ENTRYPOINT ["/docker-entrypoint.sh"]
 
-COPY docker-entrypoint.sh /entrypoint
\ No newline at end of file
+CMD ["locust"]
\ No newline at end of file