diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index af6e7deadc3..8cb29b5a46a 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -388,3 +388,6 @@ RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-stretch
 RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian
 {%- endif %}
 RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
+
+# Final cleanup. Please add new changes above.
+RUN dpkg --clear-avail; apt-get update
diff --git a/sonic-slave/Dockerfile.j2 b/sonic-slave/Dockerfile.j2
index 7ed7c4eb709..25efba4d90b 100644
--- a/sonic-slave/Dockerfile.j2
+++ b/sonic-slave/Dockerfile.j2
@@ -363,3 +363,6 @@ RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/d
 RUN echo "deb [arch={{ CONFIGURED_ARCH }}] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
 RUN apt-get -o Acquire::Check-Valid-Until=false update
 RUN apt-get -y -o Acquire::Check-Valid-Until=false install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk
+
+# Final cleanup. Please add new changes above.
+RUN dpkg --clear-avail; apt-get -o Acquire::Check-Valid-Until=false update