diff --git a/.make b/.make
index aeef46bcc6c3386fd046d23978b347c21fd37e7d..6e2ebe0077290aade5c6349a62c5c53f688df488 160000
--- a/.make
+++ b/.make
@@ -1 +1 @@
-Subproject commit aeef46bcc6c3386fd046d23978b347c21fd37e7d
+Subproject commit 6e2ebe0077290aade5c6349a62c5c53f688df488
diff --git a/.release b/.release
index 307d11e081db6271856dc0eaf0a280fc66c57974..270304987c889374a6e832d60a9a83a3db719a60 100644
--- a/.release
+++ b/.release
@@ -1,2 +1,2 @@
-release=0.3.18
-tag=0.3.18
+release=0.3.19
+tag=0.3.19
diff --git a/images/ska-tango-images-pytango-builder/.release b/images/ska-tango-images-pytango-builder/.release
index 64308128f8104db0b2dfa99a9dcff51b11c4e2a4..45265227b56cf2044d40c340d23fea1e15f8c7ee 100644
--- a/images/ska-tango-images-pytango-builder/.release
+++ b/images/ska-tango-images-pytango-builder/.release
@@ -1,3 +1,3 @@
-release=9.3.29
-tag=9.3.29
+release=9.3.30
+tag=9.3.30
 
diff --git a/images/ska-tango-images-pytango-builder/Dockerfile b/images/ska-tango-images-pytango-builder/Dockerfile
index 3e2f7e0e8049b17a5ffc6b6016984842ec45cc73..21e4401f1acdd70cb858782621ed60b5b399d99f 100644
--- a/images/ska-tango-images-pytango-builder/Dockerfile
+++ b/images/ska-tango-images-pytango-builder/Dockerfile
@@ -56,9 +56,8 @@ RUN python3 -m pip install numpy==1.19.2
 # Install poetry as a binary
 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 ln -sfn /usr/bin/python3 /usr/bin/python
+RUN ln -sfn /usr/bin/python3 /usr/bin/python && ln -sfn /opt/poetry/bin/poetry /usr/local/bin/poetry
diff --git a/images/ska-tango-images-pytango-runtime/.release b/images/ska-tango-images-pytango-runtime/.release
index e4b0a09fd79596fbab03284160bd034bf9fbdac4..0f35c027b8bb70f678f0205cff939e96d342486b 100644
--- a/images/ska-tango-images-pytango-runtime/.release
+++ b/images/ska-tango-images-pytango-runtime/.release
@@ -1,2 +1,2 @@
-release=9.3.17
-tag=9.3.17
+release=9.3.18
+tag=9.3.18
diff --git a/images/ska-tango-images-pytango-runtime/Dockerfile b/images/ska-tango-images-pytango-runtime/Dockerfile
index e20dd17202d3eaf69f19e8da8c43ce1c6a2cc5fb..e448a5192c00ddbfa07c31ab9c1b689c4779a9cd 100644
--- a/images/ska-tango-images-pytango-runtime/Dockerfile
+++ b/images/ska-tango-images-pytango-runtime/Dockerfile
@@ -5,7 +5,7 @@
 #
 ARG CAR_PYPI_REPOSITORY_URL
 ARG CAR_OCI_REGISTRY_HOST
-ARG BUILD_IMAGE="ska-tango-images-pytango-builder:0.3.17"
+ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/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
@@ -38,8 +38,9 @@ RUN apt-get update \
       make \
       curl \
       python3 \
-      python3-distutils
-
+      python3-distutils \
+      python3-setuptools 
+      
 # Copy across files that are used to help orchestrate container compositions
 # and test execution sequences
 COPY --from=buildenv /usr/local/bin/wait-for-it.sh /usr/local/bin/wait-for-it.sh
@@ -50,10 +51,10 @@ 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 ln -sfn /usr/bin/python3 /usr/bin/python
+RUN ln -sfn /usr/bin/python3 /usr/bin/python && ln -sfn /opt/poetry/bin/poetry /usr/local/bin/poetry
 
 USER tango
-ENV PATH="/opt/poetry/bin:/home/tango/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}"
+ENV PATH="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/