diff --git a/15.0/Dockerfile b/15.0/Dockerfile
index 00b0caf271225440842be904ef06569a827894cb..52e035406aec72b7f65f359a6f603d1c74cf1e9f 100644
--- a/15.0/Dockerfile
+++ b/15.0/Dockerfile
@@ -22,13 +22,15 @@ RUN groupadd -g 1000 jenkins \
  && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
 RUN OBS_DIST=openSUSE_Leap_15.0 \
- && zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/languages:/go/"${OBS_DIST}"/home:lazyfrosch:devel:languages:go.repo \
- && zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/tools/"${OBS_DIST}"/home:lazyfrosch:devel:tools.repo \
- && zypper --gpg-auto-import-keys --non-interactive install spectool createrepo
+ && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/languages:/go/"${OBS_DIST}"/home:lazyfrosch:devel:languages:go.repo \
+ && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/tools/"${OBS_DIST}"/home:lazyfrosch:devel:tools.repo \
+ && zypper --gpg-auto-import-keys --non-interactive install spectool createrepo \
+ && zypper clean -a
 
 RUN rpm --import https://packages.icinga.com/icinga.key \
- && zypper --non-interactive ar https://packages.icinga.com/openSUSE/ICINGA-release.repo \
- && zypper --non-interactive refresh
+ && zypper --non-interactive addrepo --refresh https://packages.icinga.com/openSUSE/ICINGA-release.repo \
+ && zypper --non-interactive refresh \
+ && zypper clean -a
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
diff --git a/42.3/Dockerfile b/42.3/Dockerfile
index 312935b0c36a65db6a8432017ad104a00e67b400..3b13ec09c4552378b92c09ed1f3c68a04cb1daee 100644
--- a/42.3/Dockerfile
+++ b/42.3/Dockerfile
@@ -22,13 +22,15 @@ RUN groupadd -g 1000 jenkins \
  && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
 RUN OBS_DIST=openSUSE_Leap_42.3 \
- && zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/languages:/go/"${OBS_DIST}"/home:lazyfrosch:devel:languages:go.repo \
- && zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/tools/"${OBS_DIST}"/home:lazyfrosch:devel:tools.repo \
- && zypper --gpg-auto-import-keys --non-interactive install spectool createrepo
+ && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/languages:/go/"${OBS_DIST}"/home:lazyfrosch:devel:languages:go.repo \
+ && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/tools/"${OBS_DIST}"/home:lazyfrosch:devel:tools.repo \
+ && zypper --gpg-auto-import-keys --non-interactive install spectool createrepo \
+ && zypper clean -a
 
 RUN rpm --import https://packages.icinga.com/icinga.key \
- && zypper --non-interactive ar https://packages.icinga.com/openSUSE/ICINGA-release.repo \
- && zypper --non-interactive refresh
+ && zypper --non-interactive addrepo --refresh https://packages.icinga.com/openSUSE/ICINGA-release.repo \
+ && zypper --non-interactive refresh \
+ && zypper clean -a
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]