diff --git a/Jenkinsfile b/Jenkinsfile
index e7babd8..6313b51 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,7 +56,7 @@
 // Define the remotes and the working and deploy branches
 def remote = 'origin'
 def workingBranch = 'master'
-def releaseBranch = 'release'
+def releaseBranch = 'stable'
 
 // Initialize configuration
 lazyConfig(
@@ -75,9 +75,9 @@
 		DEPLOY_DIR: '/var/www/html/public/dummy-jenkins-pl',
 		DEPLOY_CRED: 'bot-ci-dgm-rsa',
 	],
-	inLabels:   [ 'ubuntu16', 'centos7' ],
-	onLabels:   [ default: 'master', docker: 'docker', mac: 'mac', android: 'android', ],
-	noIndex:	"(${releaseBranch}|.+_.+)",	// Avoid automatic indexing for release and private branches
+	inLabels:		[ 'ubuntu16', 'centos7' ],
+	onLabels:		[ default: 'master', docker: 'docker', mac: 'mac', android: 'android', ],
+	noIndex:		"(${releaseBranch}|.+_.+)",	// Avoid automatic indexing for release and private branches
 	xmppTargets:	'noise@conference.qiy.nl',
 )
 
diff --git a/lazyDir/centos6.Dockerfile b/lazyDir/centos6.Dockerfile
index 2cfccea..6933262 100644
--- a/lazyDir/centos6.Dockerfile
+++ b/lazyDir/centos6.Dockerfile
@@ -20,42 +20,49 @@
 # Pull base image from official repo
 FROM centos:centos6.10
 
-# Enable epel repo and Install all current updates
-RUN yum -q -y update \
-	&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 \
-	&& yum -y install epel-release \
-	&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 \
-	&& yum -y upgrade \
-	&& yum -q clean all
+# 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 && \
+    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 && \
+    yum -q -y clean all --enablerepo='*'
 
 # Install common requirements
-RUN yum -q -y update \
-	&& yum -y install \
-	git \
-	wget \
-	unzip \
-	which \
-	&& yum -q clean all
+RUN yum -q clean expire-cache && \
+    yum -q -y update && \
+    yum -y install --setopt=tsflags=nodocs \
+      git \
+      wget \
+      unzip \
+      which \
+    && \
+    yum -q -y clean all --enablerepo='*'
 
-# Add internal CA and additional GPG keys
-RUN wget -q https://share.qiy.nl/public/certs/ca-digital-me-private-2026.crt -O /etc/pki/ca-trust/source/anchors/ca-digital-me-internal.pem \
-	&& update-ca-trust force-enable \
-	&& update-ca-trust extract
-RUN rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppet \
-	&& rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
+# 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 && \
+    rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB
 
-# Configure 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
+# Add internal CA
+RUN wget -q https://share.qiy.nl/public/certs/ca-digital-me-private-2026.crt -O /etc/pki/ca-trust/source/anchors/ca-digital-me-internal.pem && \
+    update-ca-trust force-enable && \
+    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
 
 # Install something and its requirements
-#RUN yum -q -y update \
-#	&& yum -y install \
-#	...
-#	&& yum -q clean all
+#RUN yum -q clean expire-cache && \
+#    yum -q -y update && \
+#     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 af0d864..20c2a7f 100644
--- a/lazyDir/centos7.Dockerfile
+++ b/lazyDir/centos7.Dockerfile
@@ -1,22 +1,61 @@
-# Pull base image from official repo
-FROM centos:centos7.7.1908
+#
+#  This work is protected under copyright law in the Kingdom of
+#  The Netherlands. The rules of the Berne Convention for the
+#  Protection of Literary and Artistic Works apply.
+#  Digital Me B.V. is the copyright owner.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
 
-# Enable epel repo and Install all current updates
-RUN yum -q -y update \
-	&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \
-	&& yum -y install epel-release \
-	&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
-	&& yum -y upgrade \
-	&& yum -q clean all
+# Pull base image from official repo
+FROM centos:centos7.8.2003
+
+# 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 && \
+    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 && \
+    yum -q -y clean all --enablerepo='*'
 
 # Install common requirements
-RUN yum -q -y update \
-	&& yum -y install \
-	git \
-	wget \
-	unzip \
-	which \
-	&& yum -q clean all
+RUN yum -q clean expire-cache && \
+    yum -q -y update && \
+    yum -y install --setopt=tsflags=nodocs \
+      git \
+      wget \
+      unzip \
+      which \
+    && \
+    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 && \
+    rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+
+# Add internal CA
+RUN wget -q https://share.qiy.nl/public/certs/ca-digital-me-private-2026.crt -O /etc/pki/ca-trust/source/anchors/ca-digital-me-internal.pem && \
+    update-ca-trust force-enable && \
+    update-ca-trust extract
+
+# 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='*'
 
 # Add user to build and package
 ARG uid=1000