diff --git a/Dockerfile.frontend-base b/Dockerfile.frontend-base
index f0be24ef4b3..113c9c9cc4b 100644
--- a/Dockerfile.frontend-base
+++ b/Dockerfile.frontend-base
@@ -32,8 +32,16 @@ RUN chown -R frontend /obs/src/api
 # builds this container
 USER frontend
 WORKDIR /obs/src/api
-RUN export NOKOGIRI_USE_SYSTEM_LIBRARIES=1; bundle install --jobs=3 --retry=3
 
+# Set up some convenience ruby binaries...
+RUN for i in ruby gem irb; do ln -s /usr/bin/$i.ruby2.4 ~/bin/$i; done
+
+# Install our bundle
+# FIXME: Retrying bundler if it fails is a workaround for https://github.com/moby/moby/issues/783
+#        which seems to happen on openSUSE (< Tumbleweed 20171001)...
+RUN export NOKOGIRI_USE_SYSTEM_LIBRARIES=1; bundle install --jobs=3 --retry=3 || bundle install --jobs=3 --retry=3
+
+# Switch to root again so we don't block changing our frontend user id...
 USER root
 
 # Run our command