diff --git a/lazyDir/centos6.Dockerfile b/lazyDir/centos6.Dockerfile
index ff9cf24..da14491 100644
--- a/lazyDir/centos6.Dockerfile
+++ b/lazyDir/centos6.Dockerfile
@@ -23,22 +23,34 @@
 # Import local GPG keys and enable epel repo
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 && \
     yum -q clean expire-cache && \
-    yum -q -y update && \
-    yum -y install --setopt=tsflags=nodocs epel-release && \
+    yum -q makecache && \
+    yum -y install --setopt=tsflags=nodocs \
+      epel-release \
+    && \
     rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 && \
     yum -q -y clean all --enablerepo='*'
 
 # Install common requirements
 RUN yum -q clean expire-cache && \
-    yum -q -y update && \
+    yum -q makecache && \
     yum -y install --setopt=tsflags=nodocs \
       git \
-      wget \
       unzip \
+      wget \
       which \
     && \
     yum -q -y clean all --enablerepo='*'
 
+# Enable Software Collections
+RUN yum -q clean expire-cache && \
+    yum -q makecache && \
+    yum -y install --setopt=tsflags=nodocs \
+      centos-release-scl \
+      scl-utils-build \
+    && \
+    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo && \
+    yum -q -y clean all --enablerepo='*'
+
 # Import extra GPG keys
 RUN rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppet && \
     rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs && \
@@ -50,19 +62,20 @@
 	  update-ca-trust extract
 
 # Configure global Yum repos
-RUN rm -f /etc/yum.repos.d/*.repo && \
-	  echo '[all]' > /etc/yum.repos.d/all.repo && \
-	  echo 'name=Private - centos6-x86_64 - All' >> /etc/yum.repos.d/all.repo && \
-	  echo 'baseurl=https://mrepo.boxtel/mrepo/testci/centos6-x86_64/RPMS.all' >> /etc/yum.repos.d/all.repo && \
-	  echo 'enabled=1' >> /etc/yum.repos.d/all.repo
+RUN rm -rf /var/cache/yum/* && \
+    rm -f /etc/yum.repos.d/*.repo && \
+    echo '[all]' > /etc/yum.repos.d/all.repo && \
+    echo 'name=Private - centos6-x86_64 - All' >> /etc/yum.repos.d/all.repo && \
+    echo 'baseurl=https://mrepo.boxtel/mrepo/testci/centos6-x86_64/RPMS.all' >> /etc/yum.repos.d/all.repo && \
+    echo 'enabled=1' >> /etc/yum.repos.d/all.repo
 
 # Install something and its requirements
 #RUN yum -q clean expire-cache && \
-#    yum -q -y update && \
-#	   yum -y install --setopt=tsflags=nodocs \
-#	   ...
-#   && \
-#   yum -q -y clean all --enablerepo='*'
+#    yum -q makecache && \
+#    yum -y install --setopt=tsflags=nodocs \
+#      ...
+#    && \
+#    yum -q -y clean all --enablerepo='*'
 
 # Add a dummy user
 ARG uid=1000
diff --git a/lazyDir/centos7.Dockerfile b/lazyDir/centos7.Dockerfile
index 3cca266..d27a61b 100644
--- a/lazyDir/centos7.Dockerfile
+++ b/lazyDir/centos7.Dockerfile
@@ -23,22 +23,34 @@
 # Import local GPG keys and enable epel repo
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
     yum -q clean expire-cache && \
-    yum -q -y update && \
-    yum -y install --setopt=tsflags=nodocs epel-release && \
+    yum -q makecache && \
+    yum -y install --setopt=tsflags=nodocs \
+      epel-release \
+    && \
     rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 && \
     yum -q -y clean all --enablerepo='*'
 
 # Install common requirements
 RUN yum -q clean expire-cache && \
-    yum -q -y update && \
+    yum -q makecache && \
     yum -y install --setopt=tsflags=nodocs \
       git \
-      wget \
       unzip \
+      wget \
       which \
     && \
     yum -q -y clean all --enablerepo='*'
 
+# Enable Software Collections
+RUN yum -q clean expire-cache && \
+    yum -q makecache && \
+    yum -y install --setopt=tsflags=nodocs \
+      centos-release-scl \
+      scl-utils-build \
+    && \
+    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo && \
+    yum -q -y clean all --enablerepo='*'
+
 # Import extra GPG keys
 RUN rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppet && \
     rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs && \
@@ -49,15 +61,23 @@
     update-ca-trust force-enable && \
 	  update-ca-trust extract
 
+# Configure global Yum repos
+RUN rm -rf /var/cache/yum/* && \
+    rm -f /etc/yum.repos.d/*.repo && \
+    echo '[all]' > /etc/yum.repos.d/all.repo && \
+    echo 'name=Private - centos7-x86_64 - All' >> /etc/yum.repos.d/all.repo && \
+    echo 'baseurl=https://mrepo.boxtel/mrepo/testci/centos7-x86_64/RPMS.all' >> /etc/yum.repos.d/all.repo && \
+    echo 'enabled=1' >> /etc/yum.repos.d/all.repo
+
 # Install something and its requirements
 #RUN yum -q clean expire-cache && \
-#    yum -q -y update && \
-#	   yum -y install --setopt=tsflags=nodocs \
-#	   ...
-#   && \
-#   yum -q -y clean all --enablerepo='*'
+#    yum -q makecache && \
+#    yum -y install --setopt=tsflags=nodocs \
+#      ...
+#    && \
+#    yum -q -y clean all --enablerepo='*'
 
-# Add user to build and package
+# Add a dummy user
 ARG uid=1000
 ARG user=dummy
 ARG gid=1000