diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72aeaba..c466efb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,25 +2,19 @@ stages:
   - compile
   - package
 
-build-ubuntu16.04:
+build-ubuntu:
   stage: compile
-  image: cm0x4d/ubuntu-qt5-cmake
+  image: burningdaylight/ubuntu-latest-devel
   script:
-    - apt-get update -qy
-    - apt-get install -y qtmultimedia5-dev
-    - mkdir build-ubuntu16.04
-    - cd build-ubuntu16.04; qmake ..; make
+    - mkdir build-ubuntu
+    - cd build-ubuntu; qmake ..; make
   artifacts:
     paths:
-      - build-ubuntu16.04/SRHDDumpReader
-  # depending on your build setup it's most likely a good idea to cache outputs to reduce the build time
-  # cache:
-  #   paths:
-  #     - "*.o"
+      - build-ubuntu/SRHDDumpReader
 
 build-win64:
   stage: compile
-  image: haffmans/mingw-qt5
+  image: burningdaylight/mingw-arch:qt
   script:
     - mkdir build-win64
     - cd build-win64; x86_64-w64-mingw32-qmake-qt5 ..; make
@@ -30,7 +24,7 @@ build-win64:
 
 build-win32:
   stage: compile
-  image: haffmans/mingw-qt5
+  image: burningdaylight/mingw-arch:qt
   script:
     - mkdir build-win32
     - cd build-win32; i686-w64-mingw32-qmake-qt5 ..; make
@@ -40,32 +34,30 @@ build-win32:
 
 pack-win64:
   stage: package
-  image: haffmans/mingw-qt5
+  image: burningdaylight/mingw-arch:qt
   script:
     - mkdir -p ./SRHDDumpReader/platforms/
     - mkdir -p ./SRHDDumpReader/imageformats/
     - cp build-win64/release/SRHDDumpReader.exe ./SRHDDumpReader/
-    - cp /usr/x86_64-w64-mingw32/bin/{libbz2-1,libGLESv2,libiconv-2,libpcre-1,libwinpthread-1,Qt5Multimedia,zlib1,libfreetype-6,libglib-2.0-0,libintl-8,libpng16-16,Qt5Core,Qt5Network,libgcc_s_seh-1,libharfbuzz-0,libpcre16-0,libpcre2-16-0,libgraphite2,libstdc++-6,Qt5Gui,Qt5Widgets,Qt5Svg}.dll ./SRHDDumpReader/
+    - cp /usr/x86_64-w64-mingw32/bin/{libssp-0,libbz2-1,libiconv-2,libpcre-1,libwinpthread-1,Qt5Multimedia,zlib1,libfreetype-6,libglib-2.0-0,libintl-8,libpng16-16,Qt5Core,Qt5Network,libgcc_s_seh-1,libharfbuzz-0,libpcre16-0,libpcre2-16-0,libgraphite2,libstdc++-6,Qt5Gui,Qt5Widgets,Qt5Svg}.dll ./SRHDDumpReader/
     - cp /usr/x86_64-w64-mingw32/lib/qt/plugins/platforms/qwindows.dll ./SRHDDumpReader/platforms/
     - cp /usr/x86_64-w64-mingw32/lib/qt/plugins/imageformats/{qsvg,qico,qtiff,qjpeg}.dll ./SRHDDumpReader/imageformats/
     - cp -r presets ./SRHDDumpReader/
     - cp ./*.json ./SRHDDumpReader/
     - cp ./Click1.wav ./SRHDDumpReader/
-#    - tar -czf SRHDDumpReader.tgz ./SRHDDumpReader/
   artifacts:
     name: "SRHDDumpReader_win64_${CI_BUILD_REF_NAME}-${CI_BUILD_REF:0:8}"
     paths:
-#      - SRHDDumpReader.tgz
       - SRHDDumpReader
 
 pack-win32:
   stage: package
-  image: haffmans/mingw-qt5
+  image: burningdaylight/mingw-arch:qt
   script:
     - mkdir -p ./SRHDDumpReader/platforms/
     - mkdir -p ./SRHDDumpReader/imageformats/
     - cp build-win32/release/SRHDDumpReader.exe ./SRHDDumpReader/
-    - cp /usr/i686-w64-mingw32/bin/{libbz2-1,libGLESv2,libiconv-2,libpcre-1,libwinpthread-1,Qt5Multimedia,zlib1,libfreetype-6,libglib-2.0-0,libintl-8,libpng16-16,Qt5Core,Qt5Network,libgcc_s_sjlj-1,libharfbuzz-0,libpcre16-0,libpcre2-16-0,libgraphite2,libstdc++-6,Qt5Gui,Qt5Widgets,Qt5Svg}.dll ./SRHDDumpReader/
+    - cp /usr/i686-w64-mingw32/bin/{libssp-0,libbz2-1,libiconv-2,libpcre-1,libwinpthread-1,Qt5Multimedia,zlib1,libfreetype-6,libglib-2.0-0,libintl-8,libpng16-16,Qt5Core,Qt5Network,libgcc_s_sjlj-1,libharfbuzz-0,libpcre16-0,libpcre2-16-0,libgraphite2,libstdc++-6,Qt5Gui,Qt5Widgets,Qt5Svg}.dll ./SRHDDumpReader/
     - cp /usr/i686-w64-mingw32/lib/qt/plugins/platforms/qwindows.dll ./SRHDDumpReader/platforms/
     - cp /usr/i686-w64-mingw32/lib/qt/plugins/imageformats/{qsvg,qico,qtiff,qjpeg}.dll ./SRHDDumpReader/imageformats/
     - cp -r presets ./SRHDDumpReader/
@@ -75,8 +67,3 @@ pack-win32:
     name: "SRHDDumpReader_win32_${CI_BUILD_REF_NAME}-${CI_BUILD_REF:0:8}"
     paths:
       - SRHDDumpReader
-
-#test:
-#  stage: test
-#  script:
-#    - ./runmytests.sh