diff --git a/Dockerfile b/Dockerfile
index 3ee42e173..c79d34400 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,13 +62,13 @@ RUN apt-get update -qq && \
         libtool \
         libffi-dev \
         python3 \
+        python3-dev \
         python3-mako \
         python3-pip \
+        python3-venv \
         python3-setuptools \
         wget
 
-RUN pip3 install -U setuptools mrkd mako
-
 RUN wget -q https://zlib.net/zlib-1.2.11.tar.gz \
 && tar xvf zlib-1.2.11.tar.gz \
 && cd zlib-1.2.11 \
@@ -95,12 +95,13 @@ WORKDIR /opt/lightningd
 COPY . /tmp/lightning
 RUN git clone --recursive /tmp/lightning . && \
     git checkout $(git --work-tree=/tmp/lightning --git-dir=/tmp/lightning/.git rev-parse HEAD)
-
 ARG DEVELOPER=0
 ENV PYTHON_VERSION=3
-RUN apt-get install -y --no-install-recommends python3-dev
-RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3 -
-RUN /root/.poetry/bin/poetry install
+RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python3 - \
+    && pip3 install -U pip \
+    && pip3 install -U wheel \
+    && /root/.local/bin/poetry config virtualenvs.create false \
+    && /root/.local/bin/poetry install
 
 RUN ./configure --prefix=/tmp/lightning_install --enable-static && make -j3 DEVELOPER=${DEVELOPER} && make install