diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 56a7a4d..21d1a62 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,12 +6,12 @@ on:
 
 jobs:
   job_1:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - name: install qt5
         run: |
-          sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial
+          sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic
           sudo apt-get update
           sudo apt-get install libgl1-mesa-dev qt515base qt515webengine ffmpeg qt515webchannel
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test
@@ -36,20 +36,11 @@ jobs:
           export QTDIR=/opt/qt515
           export PATH=/opt/qt515/bin:$PATH
           export LD_LIBRARY_PATH=$QT_DIR/lib/x86_64-linux-gnu:$QT_DIR/lib:$LD_LIBRARY_PATH
-          wget -O deploy.AppImage https://github.com/probonopd/linuxdeployqt/releases/download/7/linuxdeployqt-7-x86_64.AppImage
+          wget -O deploy.AppImage https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
           chmod +x deploy.AppImage
-          mkdir -p appdir/usr/bin/
-          mv fasttrack appdir/usr/bin/
-          mkdir -p appdir/usr/share/applications/
-          cp ../sh.fasttrack.fasttrack.desktop appdir/usr/share/applications/
-          mkdir -p appdir/usr/share/icons/hicolor/256x256/
-          cp ../src/assets/icon.png appdir/usr/share/icons/hicolor/256x256/fasttrack.png
-          ./deploy.AppImage ./appdir/usr/share/applications/sh.fasttrack.fasttrack.desktop -exclude-libs="libnss3.so,libnssutil3.so" -no-translations -bundle-non-qt-libs
-          mkdir -p appdir/usr/optional/ ; wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so -O ./appdir/usr/optional/exec.so
-          mkdir -p appdir/usr/optional/libstdc++/ ; cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./appdir/usr/optional/libstdc++/ ; cp /usr/lib/gcc/x86_64-linux-gnu/9/libstdc++.so ./appdir/usr/optional/libstdc++/
-          mkdir -p appdir/usr/share/metainfo/ ; cp ../sh.fasttrack.fasttrack.metainfo.xml appdir/usr/share/metainfo/
-          ( cd appdir ; rm AppRun ; wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/AppRun-patched-x86_64 -O AppRun ; chmod a+x AppRun)
-          ./deploy.AppImage ./appdir/usr/share/applications/sh.fasttrack.fasttrack.desktop -appimage
+          cp ../sh.fasttrack.fasttrack.desktop .
+          cp ../src/assets/fasttrack.png .
+          ./deploy.AppImage sh.fasttrack.fasttrack.desktop -appimage -no-translations -bundle-non-qt-libs
           mv FastTrack*.AppImage FastTrack-x86_64.AppImage
       - name: Linux artefact
         uses: actions/upload-artifact@v1
diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
index a460b36..fab10ad 100644
--- a/.github/workflows/build_cli.yml
+++ b/.github/workflows/build_cli.yml
@@ -7,12 +7,12 @@ on:
 jobs:
 
   job_1:
-      runs-on: ubuntu-16.04
+      runs-on: ubuntu-18.04
       steps:
         - uses: actions/checkout@v2
         - name: install qt5
           run: |
-             sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial
+             sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic
              sudo apt-get update
              sudo apt-get install libgl1-mesa-dev qt515base qt515webengine ffmpeg
              sudo add-apt-repository ppa:ubuntu-toolchain-r/test
@@ -36,19 +36,12 @@ jobs:
               export QTDIR=/opt/qt515
               export PATH=/opt/qt515/bin:$PATH
               export LD_LIBRARY_PATH=$QT_DIR/lib/x86_64-linux-gnu:$QT_DIR/lib:$LD_LIBRARY_PATH
-              wget -O deploy.AppImage https://github.com/probonopd/linuxdeployqt/releases/download/5/linuxdeployqt-5-x86_64.AppImage
+              wget -O deploy.AppImage https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
               chmod +x deploy.AppImage
-              mkdir -p appdir/usr/bin/
-              mv fasttrack-cli appdir/usr/bin/
-              mkdir -p appdir/usr/share/applications/
-              cp ../sh.fasttrack.fasttrackcli.desktop appdir/usr/share/applications/
-              mkdir -p appdir/usr/share/icons/hicolor/256x256/
-              cp ../src/assets/icon.png appdir/usr/share/icons/hicolor/256x256/fasttrack.png
-              ./deploy.AppImage ./appdir/usr/share/applications/sh.fasttrack.fasttrackcli.desktop -exclude-libs="libnss3.so,libnssutil3.so" -no-translations -bundle-non-qt-libs
-              mkdir -p appdir/usr/optional/ ; wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so -O ./appdir/usr/optional/exec.so
-              mkdir -p appdir/usr/optional/libstdc++/ ; cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./appdir/usr/optional/libstdc++/ ; cp /usr/lib/gcc/x86_64-linux-gnu/9/libstdc++.so ./appdir/usr/optional/libstdc++/
-              ( cd appdir ; rm AppRun ; wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/AppRun-patched-x86_64 -O AppRun ; chmod a+x AppRun)
-              ./deploy.AppImage ./appdir/usr/share/applications/sh.fasttrack.fasttrackcli.desktop -appimage
+              cp ../sh.fasttrack.fasttrackcli.desktop .
+              cp ../src/assets/fasttrack.png .
+              ./deploy.AppImage sh.fasttrack.fasttrackcli.desktop -appimage -no-translations -bundle-non-qt-libs
+              mv FastTrack*.AppImage FastTrack-cli-x86_64.AppImage
         - name: Linux artefact
           uses: actions/upload-artifact@v1
           with: