diff --git a/images/ska-tango-images-pytango-builder/Dockerfile b/images/ska-tango-images-pytango-builder/Dockerfile
index b352240998e5c5f25de74d88eb1aebfaa8d83ebd..3e2f7e0e8049b17a5ffc6b6016984842ec45cc73 100644
--- a/images/ska-tango-images-pytango-builder/Dockerfile
+++ b/images/ska-tango-images-pytango-builder/Dockerfile
@@ -54,9 +54,11 @@ WORKDIR /app
 RUN python3 -m pip install numpy==1.19.2
 
 # Install poetry as a binary
-RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/usr/local/bin/poetry python3 - --yes
+ENV POETRY_HOME=/opt/poetry
+RUN curl -sSL https://install.python-poetry.org | python3 - --yes
+ENV PATH="${POETRY_HOME}/bin:${PATH}"
 
 COPY requirements.txt /requirements.txt
 RUN python3 -m pip install -r /requirements.txt
 
-RUN mkdir /venv && ln -s /usr/* /venv/  && ln -s /usr/local/bin/itango3 /venv/bin/itango3 && ln -sfn /usr/bin/python3 /usr/bin/python
+RUN ln -sfn /usr/bin/python3 /usr/bin/python
diff --git a/images/ska-tango-images-pytango-runtime/Dockerfile b/images/ska-tango-images-pytango-runtime/Dockerfile
index b9262a61f2cfb5bb33793c8f16a6499b8eb5d455..e20dd17202d3eaf69f19e8da8c43ce1c6a2cc5fb 100644
--- a/images/ska-tango-images-pytango-runtime/Dockerfile
+++ b/images/ska-tango-images-pytango-runtime/Dockerfile
@@ -5,8 +5,8 @@
 #
 ARG CAR_PYPI_REPOSITORY_URL
 ARG CAR_OCI_REGISTRY_HOST
-ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-pytango-builder:9.3.13"
-ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp:9.3.7"
+ARG BUILD_IMAGE="ska-tango-images-pytango-builder:0.3.17"
+ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp:9.3.11"
 
 FROM ${BUILD_IMAGE} as buildenv
 FROM $BASE_IMAGE
@@ -45,14 +45,15 @@ RUN apt-get update \
 COPY --from=buildenv /usr/local/bin/wait-for-it.sh /usr/local/bin/wait-for-it.sh
 COPY --from=buildenv /usr/local/bin/retry /usr/local/bin/retry
 COPY --from=buildenv /usr/local/lib/python3.7 /usr/local/lib/python3.7
+COPY --from=buildenv /opt/poetry /opt/poetry
 
 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
 COPY pip.conf /etc/pip.conf
 
-RUN mkdir /venv && ln -s /usr/* /venv/ && ln -s /usr/bin/python3 /venv/bin/python && ln -s /usr/local/bin/itango3 /venv/bin/itango3
+RUN ln -sfn /usr/bin/python3 /usr/bin/python
 
 USER tango
-ENV PATH="/home/tango/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}"
+ENV PATH="/opt/poetry/bin:/home/tango/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}"
 
 ONBUILD COPY --chown=tango:tango . /app
 ONBUILD COPY --from=buildenv /usr/local/bin/ /usr/local/bin/