diff --git a/images/ska-tango-images-pytango-builder/Dockerfile b/images/ska-tango-images-pytango-builder/Dockerfile
index 84bef05e7a7f95cf3c54dcd48abb04cc1f08509d..6f2baa8001096959949a135edf5e4466423efe83 100644
--- a/images/ska-tango-images-pytango-builder/Dockerfile
+++ b/images/ska-tango-images-pytango-builder/Dockerfile
@@ -47,9 +47,6 @@ RUN apt-get update && \
 RUN curl -k https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
 COPY pip.conf /etc/pip.conf
 
-# Workaround for poetry intended bug: https://github.com/python-poetry/poetry/issues/6013
-RUN pip install distro-info==1.0
-
 WORKDIR /app
 
 # Install numpy manually before PyTango and other requirements to ensure we
diff --git a/images/ska-tango-images-tango-cpp/Dockerfile b/images/ska-tango-images-tango-cpp/Dockerfile
index 3eca01a302c7ca84b3421683421a161cb40e6d1c..b25ff0bdcfbcb8af1b0dea69996aaaaab50a37ca 100644
--- a/images/ska-tango-images-tango-cpp/Dockerfile
+++ b/images/ska-tango-images-tango-cpp/Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update && \
 
 # Apply security upgrades (base image is not patched)
 RUN unattended-upgrade
+RUN apt-get purge unattended-upgrades -y
 
 # build and install tangoidl
 RUN mkdir -p /usr/src/idl
diff --git a/images/ska-tango-images-tango-db/Dockerfile b/images/ska-tango-images-tango-db/Dockerfile
index f167610d2c7a73b218e5b1539114e27e0286ae2e..9ebb44646dd417c7648ee2f029f44efeed361d9d 100644
--- a/images/ska-tango-images-tango-db/Dockerfile
+++ b/images/ska-tango-images-tango-db/Dockerfile
@@ -12,6 +12,7 @@ RUN apt-get update && \
 
 # Apply security upgrades (base image is not patched)
 RUN unattended-upgrade
+RUN apt-get purge unattended-upgrades -y
 
 RUN mkdir -p /usr/src/tango
 
diff --git a/images/ska-tango-images-tango-dependencies/Dockerfile b/images/ska-tango-images-tango-dependencies/Dockerfile
index b086644f7358f1b52177ba85df24fa0780725b24..0314e341b8b3708e1df660ef9956a760bdc4fbdc 100644
--- a/images/ska-tango-images-tango-dependencies/Dockerfile
+++ b/images/ska-tango-images-tango-dependencies/Dockerfile
@@ -34,6 +34,7 @@ RUN apt-get update && \
 
 # Apply security upgrades (base image)
 RUN unattended-upgrade
+RUN apt-get purge unattended-upgrades -y
 
 RUN mkdir /usr/src/zeromq
 WORKDIR /usr/src/zeromq