diff --git a/image/Dockerfile b/image/Dockerfile
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,8 +1,11 @@
-FROM ubuntu:wily
+FROM ubuntu:bionic
 
 LABEL Description="KDE on Android SDK"
 MAINTAINER Andreas Cord-Landwehr <cordlandwehr@kde.org>
 
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
+
 ENV ADIR /opt/android
 RUN mkdir -p $ADIR
 
@@ -15,27 +18,27 @@
 # skeleton files that are used for all users
 RUN echo "\n\
 export ADIR=$ADIR\n\
-export Qt5_android=$ADIR/Qt5.6.0/5.6/android_armv7/\n\
+export Qt5_android=$ADIR/Qt5.8.0/5.8/android_armv7/\n\
 export PATH=$ADIR/android-sdk-linux/platform-tools/:$PATH\n\
 export ANT=/usr/bin/ant\n\
 export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/\n\
 \n\
 function cmakeandroid {\n\
-    cmake \$@ -DCMAKE_INSTALL_PREFIX=$ADIR/kde/install -DCMAKE_PREFIX_PATH=\"$ADIR/Qt5.6.0/5.6/android_armv7/;$ADIR/kde/install\" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$ADIR/kde/install/share/ECM/toolchain/Android.cmake\n\
+    cmake \$@ -DCMAKE_INSTALL_PREFIX=$ADIR/kde/install -DCMAKE_PREFIX_PATH=\"$ADIR/Qt5.8.0/5.8/android_armv7/;$ADIR/kde/install\" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$ADIR/kde/install/share/ECM/toolchain/Android.cmake\n\
 }\n\
 " >> /etc/skel/.bashrc
 
-RUN echo "deb [arch=armhf] http://ports.ubuntu.com/ wily main universe restricted\n\
-deb-src [arch=armhf]  http://ports.ubuntu.com/ wily main universe restricted\n\
+RUN echo "deb [arch=armhf] http://ports.ubuntu.com/ bionic main universe restricted\n\
+deb-src [arch=armhf]  http://ports.ubuntu.com/ bionic main universe restricted\n\
 \n\
-deb [arch=armhf] http://ports.ubuntu.com/ wily-updates main universe restricted\n\
-deb-src [arch=armhf] http://ports.ubuntu.com/ wily-updates main universe restricted\n\
+deb [arch=armhf] http://ports.ubuntu.com/ bionic-updates main universe restricted\n\
+deb-src [arch=armhf] http://ports.ubuntu.com/ bionic-updates main universe restricted\n\
 \n\
-deb [arch=i386,amd64] http://archive.ubuntu.com/ubuntu wily main universe restricted\n\
-deb-src [arch=i386,amd64] http://archive.ubuntu.com/ubuntu wily main universe restricted\n\
+deb [arch=i386,amd64] http://archive.ubuntu.com/ubuntu bionic main universe restricted\n\
+deb-src [arch=i386,amd64] http://archive.ubuntu.com/ubuntu bionic main universe restricted\n\
 \n\
-deb [arch=i386,amd64] http://archive.ubuntu.com/ubuntu wily-updates main universe restricted\n\
-deb-src [arch=i386,amd64] http://archive.ubuntu.com/ubuntu wily-updates main universe restricted\n\
+deb [arch=i386,amd64] http://archive.ubuntu.com/ubuntu bionic-updates main universe restricted\n\
+deb-src [arch=i386,amd64] http://archive.ubuntu.com/ubuntu bionic-updates main universe restricted\n\
 " > /etc/apt/sources.list
 
 # enable verbose apt-get output
@@ -50,8 +53,8 @@
 # required for running kdesrc-build
   libxml-simple-perl \
   libjson-perl \
-  openjdk-7-jdk \
-  openjdk-7-jre \
+  openjdk-8-jdk \
+  openjdk-8-jre \
   qt5-qmake \
   ssh \
   sudo \
@@ -125,12 +128,12 @@
 
 #get Qt for Android
 RUN echo "Qt Installer: downloading..." && \
-  curl http://master.qt.io/archive/qt/5.6/5.6.0/qt-opensource-linux-x64-android-5.6.0.run -o $ADIR/qt-installer.run && \
+  curl http://master.qt.io/archive/qt/5.8/5.8.0/qt-opensource-linux-x64-android-5.8.0.run -o $ADIR/qt-installer.run && \
   chmod +x $ADIR/qt-installer.run
 
 COPY qtinstallerconfig.qs $ADIR/qtinstallerconfig.qs
 # run visual installer with simulated X window, filter out all warning messages due to not having a proper window
-RUN xvfb-run -a $ADIR/qt-installer.run --script $ADIR/qtinstallerconfig.qs|grep -v "Warning: QPainter" | grep -v "Warning: QWidget" && \
+RUN xvfb-run -a $ADIR/qt-installer.run --script $ADIR/qtinstallerconfig.qs|grep -v "Warning: QPainter" | grep -v "Warning: QWidget" | grep -v 'Warning: QXcbConnection: XCB error' && \
   echo "Qt Installer: done."
 
 # cleanup
@@ -150,7 +153,7 @@
 
 RUN cd $ADIR && \
   ./kdesrc-build extra-cmake-modules
-  
+
 RUN echo "Configuration finished, finalizing Docker image..."
 
 USER root
diff --git a/image/qtinstallerconfig.qs b/image/qtinstallerconfig.qs
--- a/image/qtinstallerconfig.qs
+++ b/image/qtinstallerconfig.qs
@@ -25,7 +25,7 @@
 
 function Controller()
 {
-    console.log("Control script loaded: Qt 5.6 Android with Linux 64 bit host.")
+    console.log("Control script loaded: Qt 5.8 Android with Linux 64 bit host.")
     installer.autoRejectMessageBoxes
 }
 
@@ -62,7 +62,7 @@
 {
     var page = gui.pageWidgetByObjectName("TargetDirectoryPage")
     // set target directory
-    page.TargetDirectoryLineEdit.text = "/opt/android/Qt5.6.0"
+    page.TargetDirectoryLineEdit.text = "/opt/android/Qt5.8.0"
     gui.clickButton(buttons.NextButton)
 }
 
@@ -79,11 +79,11 @@
 {
     var page = gui.pageWidgetByObjectName("ComponentSelectionPage")
     page.deselectAll()
-    page.selectComponent("qt.56.android_armv7")
-    page.selectComponent("qt.56.qtquickcontrols")
-    page.selectComponent("qt.56.qtscript")
-    page.selectComponent("qt.56.qtlocation")
-    page.selectComponent("qt.56.qt3d")
+    page.selectComponent("qt.58.android_armv7")
+    page.selectComponent("qt.58.qtquickcontrols")
+    page.selectComponent("qt.58.qtscript")
+    page.selectComponent("qt.58.qtlocation")
+    page.selectComponent("qt.58.qt3d")
 
     gui.clickButton(buttons.NextButton)
 }