diff --git a/reposync/Dockerfile b/reposync/Dockerfile
index e69b05597247bcc6e3ab11c9a2df705888ec6f59..9ef533af7ff637df0802cc84205b0d6d4ed62d05 100644
--- a/reposync/Dockerfile
+++ b/reposync/Dockerfile
@@ -1,6 +1,7 @@
 FROM cern/cc7-base
 
-RUN yum install -y jq
+RUN yum install -y jq \
+  && yum clean all
 
 RUN rm -rf /etc/yum.repos.d
 COPY yum.repos.d /etc/yum.repos.d/
diff --git a/scheduler/Dockerfile b/scheduler/Dockerfile
index e912b4bf5b221d24cac92caffcd896a6d3f89098..b5879ebe106d93b088e9945c110e7951b580c24e 100644
--- a/scheduler/Dockerfile
+++ b/scheduler/Dockerfile
@@ -2,15 +2,15 @@ FROM cern/cc7-base
 
 ENV NOMAD_VERSION 0.8.4
 
-RUN yum install -y jq unzip
+RUN yum install -y jq unzip \
+  && yum clean all
 
 ADD https://releases.hashicorp.com/nomad/${NOMAD_VERSION}/nomad_${NOMAD_VERSION}_linux_amd64.zip /tmp/nomad.zip
-RUN unzip /tmp/nomad.zip -d /usr/local/bin/
+RUN unzip /tmp/nomad.zip -d /usr/local/bin/ \
+  && rm -rf /etc/yum.repos.d
 
-RUN rm -rf /etc/yum.repos.d
 COPY yum.repos.d /etc/yum.repos.d/
-COPY repos.json /root/
-COPY schedulereposync.sh /root/
+COPY repos.json schedulereposync.sh /root/
 
 WORKDIR /root