diff --git a/Jenkinsfile b/Jenkinsfile
index d044a7f..c208a9e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -75,7 +75,7 @@
 		DEPLOY_DIR: '/var/www/html/public/dummy-jenkins-pl',
 		DEPLOY_CRED: 'bot-ci-dgm-rsa',
 	],
-	inLabels:   [ 'ubuntu-16', 'centos-7' ],
+	inLabels:   [ 'ubuntu16', 'centos7' ],
 	onLabels:   [ default: 'master', docker: 'docker', mac: 'mac', android: 'android', ],
 	noIndex:	"(${releaseBranch}|.+_.+)",	// Avoid automatic indexing for release and private branches
 )
@@ -97,7 +97,7 @@
 			},
 		],
 /*		[ run: { echo "This is my second task" }, in: '*', on: 'docker' ],
-		[ run: "third.sh -v", in: [ 'ubuntu-16', 'centos-7'], on: 'docker',],
+		[ run: "third.sh -v", in: [ 'ubuntu16', 'centos7'], on: 'docker',],
 		[ run: [ "fourth-a.sh -v -m c", "fourth-b.sh -v -m d"], on: 'mac' ],
 		[ run: [ "fourth-a.sh -v -m e", "fourth-b.sh -v -m f"], on: 'android' ],
 */	]
diff --git a/lazyDir/centos-6.Dockerfile b/lazyDir/centos-6.Dockerfile
deleted file mode 100644
index 2cfccea..0000000
--- a/lazyDir/centos-6.Dockerfile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-#  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.
-#
-
-# 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
-
-# Install common requirements
-RUN yum -q -y update \
-	&& yum -y install \
-	git \
-	wget \
-	unzip \
-	which \
-	&& yum -q clean all
-
-# 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
-
-# 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
-
-# Install something and its requirements
-#RUN yum -q -y update \
-#	&& yum -y install \
-#	...
-#	&& yum -q clean all
-
-# Add a dummy user
-ARG uid=1000
-ARG user=dummy
-ARG gid=1000
-ARG group=dummy
-
-RUN groupadd -g "${gid}" "${group}" && useradd -ms /bin/bash -g "${group}" -u "${uid}" "${user}"
-
-# Get script directory from lazyLib
-ARG dir=.
diff --git a/lazyDir/centos-7.Dockerfile b/lazyDir/centos-7.Dockerfile
deleted file mode 100644
index af0d864..0000000
--- a/lazyDir/centos-7.Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Pull base image from official repo
-FROM centos:centos7.7.1908
-
-# 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
-
-# Install common requirements
-RUN yum -q -y update \
-	&& yum -y install \
-	git \
-	wget \
-	unzip \
-	which \
-	&& yum -q clean all
-
-# Add user to build and package
-ARG uid=1000
-ARG user=dummy
-ARG gid=1000
-ARG group=dummy
-
-RUN groupadd -g "${gid}" "${group}" && useradd -ms /bin/bash -g "${group}" -u "${uid}" "${user}"
-
-# Get script directory from lazyLib
-ARG dir=.
diff --git a/lazyDir/centos6.Dockerfile b/lazyDir/centos6.Dockerfile
new file mode 100644
index 0000000..2cfccea
--- /dev/null
+++ b/lazyDir/centos6.Dockerfile
@@ -0,0 +1,69 @@
+#
+#  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.
+#
+
+# 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
+
+# Install common requirements
+RUN yum -q -y update \
+	&& yum -y install \
+	git \
+	wget \
+	unzip \
+	which \
+	&& yum -q clean all
+
+# 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
+
+# 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
+
+# Install something and its requirements
+#RUN yum -q -y update \
+#	&& yum -y install \
+#	...
+#	&& yum -q clean all
+
+# Add a dummy user
+ARG uid=1000
+ARG user=dummy
+ARG gid=1000
+ARG group=dummy
+
+RUN groupadd -g "${gid}" "${group}" && useradd -ms /bin/bash -g "${group}" -u "${uid}" "${user}"
+
+# Get script directory from lazyLib
+ARG dir=.
diff --git a/lazyDir/centos7.Dockerfile b/lazyDir/centos7.Dockerfile
new file mode 100644
index 0000000..af0d864
--- /dev/null
+++ b/lazyDir/centos7.Dockerfile
@@ -0,0 +1,30 @@
+# Pull base image from official repo
+FROM centos:centos7.7.1908
+
+# 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
+
+# Install common requirements
+RUN yum -q -y update \
+	&& yum -y install \
+	git \
+	wget \
+	unzip \
+	which \
+	&& yum -q clean all
+
+# Add user to build and package
+ARG uid=1000
+ARG user=dummy
+ARG gid=1000
+ARG group=dummy
+
+RUN groupadd -g "${gid}" "${group}" && useradd -ms /bin/bash -g "${group}" -u "${uid}" "${user}"
+
+# Get script directory from lazyLib
+ARG dir=.
diff --git a/lazyDir/ubuntu-16.Dockerfile b/lazyDir/ubuntu-16.Dockerfile
deleted file mode 100644
index bdb260a..0000000
--- a/lazyDir/ubuntu-16.Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Pull base image from official repo
-FROM ubuntu:16.04
-
-# Install all current updates
-RUN apt-get -y update \
-	&& apt-get -y dist-upgrade \
-	&& apt-get clean
-
-# Install common requirements
-RUN apt-get -y update \
-	&& apt-get -y install \
-	git \
-	wget \
-	unzip \
-	&& apt-get clean
-
-# Add user to build and package
-ARG uid=1000
-ARG user=dummy
-ARG gid=1000
-ARG group=dummy
-
-RUN groupadd -g "${gid}" "${group}" && useradd -ms /bin/bash -g "${group}" -u "${uid}" "${user}"
-
-# Get script directory from lazyLib
-ARG dir=.
diff --git a/lazyDir/ubuntu16.Dockerfile b/lazyDir/ubuntu16.Dockerfile
new file mode 100644
index 0000000..bdb260a
--- /dev/null
+++ b/lazyDir/ubuntu16.Dockerfile
@@ -0,0 +1,26 @@
+# Pull base image from official repo
+FROM ubuntu:16.04
+
+# Install all current updates
+RUN apt-get -y update \
+	&& apt-get -y dist-upgrade \
+	&& apt-get clean
+
+# Install common requirements
+RUN apt-get -y update \
+	&& apt-get -y install \
+	git \
+	wget \
+	unzip \
+	&& apt-get clean
+
+# Add user to build and package
+ARG uid=1000
+ARG user=dummy
+ARG gid=1000
+ARG group=dummy
+
+RUN groupadd -g "${gid}" "${group}" && useradd -ms /bin/bash -g "${group}" -u "${uid}" "${user}"
+
+# Get script directory from lazyLib
+ARG dir=.