diff --git a/15.0/Dockerfile b/15.0/Dockerfile
index 8a7fb005349a18de8628a197784bc1ee17dcc483..00b0caf271225440842be904ef06569a827894cb 100644
--- a/15.0/Dockerfile
+++ b/15.0/Dockerfile
@@ -21,8 +21,9 @@ RUN groupadd -g 1000 jenkins \
  && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
  && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
-RUN zypper --non-interactive addrepo https://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Leap_15.0/devel:languages:go.repo \
- && zypper --non-interactive addrepo http://download.opensuse.org/repositories/home:lazyfrosch:devel:tools/openSUSE_Leap_15.0/home:lazyfrosch:devel:tools.repo \
+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
 
 RUN rpm --import https://packages.icinga.com/icinga.key \
diff --git a/42.3/Dockerfile b/42.3/Dockerfile
index 918163c3918897b8f5e5f626bcb154951edf8f9f..312935b0c36a65db6a8432017ad104a00e67b400 100644
--- a/42.3/Dockerfile
+++ b/42.3/Dockerfile
@@ -21,8 +21,9 @@ RUN groupadd -g 1000 jenkins \
  && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
  && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
-RUN zypper --non-interactive addrepo https://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Leap_42.3/devel:languages:go.repo \
- && zypper --non-interactive addrepo http://download.opensuse.org/repositories/home:lazyfrosch:devel:tools/openSUSE_Leap_42.3/home:lazyfrosch:devel:tools.repo \
+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
 
 RUN rpm --import https://packages.icinga.com/icinga.key \