diff --git a/docker/master/Dockerfile b/docker/master/Dockerfile
index 0b5f690833..9ed9b4dab6 100644
--- a/docker/master/Dockerfile
+++ b/docker/master/Dockerfile
@@ -38,6 +38,9 @@ RUN apt-get update && apt-get install -y curl \
 RUN apt-get update && apt-get install -y freeswitch-all \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
+# Clean up
+RUN apt-get autoremove
+
 COPY docker-entrypoint.sh /
 # Add anything else here
 
@@ -67,9 +70,6 @@ SHELL       ["/bin/bash"]
 HEALTHCHECK --interval=15s --timeout=5s \
     CMD  fs_cli -x status | grep -q ^UP || exit 1
 
-# Clean up
-RUN apt-clean --aggressive
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
 
diff --git a/docker/release/Dockerfile b/docker/release/Dockerfile
index 1e1f15bc45..ef37e93aeb 100644
--- a/docker/release/Dockerfile
+++ b/docker/release/Dockerfile
@@ -38,6 +38,9 @@ RUN apt-get update && apt-get install -y curl \
 RUN apt-get update && apt-get install -y freeswitch-all \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
+# Clean up
+RUN apt-get autoremove
+
 COPY docker-entrypoint.sh /
 ## Ports
 # Open the container up to the world.
@@ -65,9 +68,6 @@ SHELL       ["/bin/bash"]
 HEALTHCHECK --interval=15s --timeout=5s \
     CMD  fs_cli -x status | grep -q ^UP || exit 1
 
-# Clean up
-RUN apt-clean --aggressive
-
 ## Add additional things here
 
 ##