diff --git a/Dockerfile.core b/Dockerfile.core
index 42146b9..691549f 100644
--- a/Dockerfile.core
+++ b/Dockerfile.core
@@ -18,7 +18,6 @@ RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
         ca-certificates \
         curl && \
-    rm -rf /var/lib/apt/lists/* && \
     curl -sL https://deb.nodesource.com/setup_16.x | bash -
 
 # Prepare Yarn
@@ -26,7 +25,6 @@ RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
         ca-certificates \
         curl && \
-    rm -rf /var/lib/apt/lists/* && \
     curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
@@ -60,8 +58,7 @@ RUN apt-get update -y && \
 	php7.4-xml \
     php7.4-zip \
     supervisor \
-    yarn && \
-    rm -rf /var/lib/apt/lists/*
+    yarn
 
 # Configure packages
 RUN a2enmod rewrite actions fcgid alias proxy_fcgi setenvif remoteip && \
@@ -90,7 +87,6 @@ RUN apt-get update -y && \
 	    pkg-config && \
     git clone https://github.com/facebook/duckling.git fb-duckling && \
     curl -sSL https://get.haskellstack.org/ | sh && \
-    rm -rf /var/lib/apt/lists/* && \
     cd fb-duckling && \
     stack build
 
@@ -107,6 +103,9 @@ RUN apt-get update -y && \
     apt-get update -y && \
     apt-get install -y libreoffice
 
+# Cleanup apt cache
+RUN rm -rf /var/lib/apt/lists/*
+
 # Prepare Supervisor
 RUN mkdir /var/log/queue