diff --git a/.appveyor.yml b/.appveyor.yml
index 3a30988a..a3806912 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -31,9 +31,8 @@ image:
   # AppVeyor builds are ordered by the image list:
   - Visual Studio 2019
   - macos-monterey
-  - Ubuntu1804
   - Ubuntu2004
-  - Previous Ubuntu2004
+  - Ubuntu2204
   - Visual Studio 2022
 
 matrix:
@@ -51,17 +50,13 @@ matrix:
       COMPILER: GCC
     - image: Visual Studio 2019
       COMPILER: MSVC
-    - image: Ubuntu1804
-      COMPILER: MinGW
-    - image: Ubuntu1804
-      COMPILER: MSVC
     - image: Ubuntu2004
       COMPILER: MinGW
     - image: Ubuntu2004
       COMPILER: MSVC
-    - image: Previous Ubuntu2004
+    - image: Ubuntu2204
       COMPILER: MinGW
-    - image: Previous Ubuntu2004
+    - image: Ubuntu2204
       COMPILER: MSVC
     - image: macos-monterey
       COMPILER: GCC
@@ -70,23 +65,16 @@ matrix:
     - image: macos-monterey
       COMPILER: MSVC
     # Following builds are disabled to prevent build timeouts
-    - image: Ubuntu1804
-      COMPILER: Clang
     - image: Ubuntu2004
       COMPILER: Clang
-    - image: Previous Ubuntu2004
+    - image: Ubuntu2204
       COMPILER: Clang
-    - image: Ubuntu2004
+    - image: Ubuntu2204
       ARCH: arm64 
-    - image: Previous Ubuntu2004
-      ARCH: arm64
     - image: Visual Studio 2022
       COMPILER: MSVC
-    # x64 .deb is either Ubuntu or Debian stable
-    - image: Previous Ubuntu2004
-      ARCH: x64
     # Following builds are not supported by AppImage
-    - image: Ubuntu1804
+    - image: Ubuntu2004
       ARCH: arm64
 
 for:
@@ -94,7 +82,7 @@ for:
   -
     matrix:
       only:
-        - image: Ubuntu1804
+        - image: Ubuntu2004
 
     clone_folder: ~/mmapper
 
@@ -130,55 +118,11 @@ for:
       - path: MMapper-*.AppImage.zsync
         name: MMapper AppImage Updateable
 
-  # Ubuntu
-  -
-    matrix:
-      only:
-        - image: Ubuntu2004
-
-    clone_folder: ~/mmapper
-
-    init:
-      - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN)
-      - sh: if [[ $ARCH == x64 ]]; then export TARGET_ARCHITECTURE=amd64 ; fi
-      - sh: if [[ $ARCH == arm64 ]]; then export TARGET_ARCHITECTURE=arm64 ; fi
-      - sh: echo TARGET_ARCHITECTURE=$TARGET_ARCHITECTURE
-
-    install:
-      - ps: $env:package_version = ("$(git describe --tags --always --long)").trim()
-      - ps: Update-AppveyorBuild -Version "$env:package_version-$env:APPVEYOR_BUILD_NUMBER"
-      - sh: sudo apt update -qq
-      - sh: sudo apt install -y build-essential git qt5-qmake libqt5opengl5-dev zlib1g-dev libssl-dev cmake ninja-build libminiupnpc-dev
-
-    build_script:
-      - sh: mkdir build
-      - sh: cd build
-      - sh: cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DTARGET_ARCHITECTURE=$TARGET_ARCHITECTURE -DUSE_UNITY_BUILD=ON
-      - sh: cmake --build . -j$(getconf _NPROCESSORS_ONLN)
-      - sh: cpack
-      - sh: mv *.deb* ../
-
-    test_script:
-      - sh: QT_QPA_PLATFORM=offscreen ctest -V --no-compress-output -T test
-      # Transform test results from ctest to junit format
-      - ps: $XSLInputElement = New-Object System.Xml.Xsl.XslCompiledTransform
-      - ps: $XSLInputElement.Load("https://raw.githubusercontent.com/rpavlik/jenkins-ctest-plugin/master/ctest-to-junit.xsl")
-      - ps: $XSLInputElement.Transform((Resolve-Path .\Testing\*\Test.xml), (Join-Path (Resolve-Path .) "ctest-to-junit-results.xml"))
-      - ps: $wc = New-Object 'System.Net.WebClient'
-      - ps: $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\ctest-to-junit-results.xml))
-
-    artifacts:
-      - path: mmapper-*-Linux-*.deb
-        name: MMapper Debian Package
-
-      - path: mmapper-*-Linux-*.*.sha256
-        name: MMapper Checksums
-
   # Ubuntu (Debian)
   -
     matrix:
       only:
-        - image: Previous Ubuntu2004
+        - image: Ubuntu2204
 
     clone_folder: ~/mmapper
 
@@ -187,9 +131,9 @@ for:
 
     init:
       - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN)
-      - sh: if [[ $ARCH == x64 ]]; then export DOCKER_IMAGE=multiarch/debian-debootstrap:amd64-bullseye ; fi
+      - sh: if [[ $ARCH == x64 ]]; then export DOCKER_IMAGE=multiarch/ubuntu-debootstrap:amd64-focal ; fi
       - sh: if [[ $ARCH == x64 ]]; then export TARGET_ARCHITECTURE=amd64 ; fi
-      - sh: if [[ $ARCH == arm64 ]]; then export DOCKER_IMAGE=multiarch/debian-debootstrap:arm64-bullseye ; fi
+      - sh: if [[ $ARCH == arm64 ]]; then export DOCKER_IMAGE=multiarch/debian-debootstrap:arm64-bookworm ; fi
       - sh: if [[ $ARCH == arm64 ]]; then export TARGET_ARCHITECTURE=arm64 ; fi
       - sh: echo TARGET_ARCHITECTURE=$TARGET_ARCHITECTURE
       - sh: echo DOCKER_IMAGE=$DOCKER_IMAGE
@@ -284,7 +228,7 @@ for:
     clone_folder: c:\Build\MMapper
 
     cache:
-      - mingw_cache -> C:\Qt\Tools\mingw1310_64\**
+      - C:\Qt\Tools\mingw1310_64
 
     init:
       - cmd: if %COMPILER%==MinGW set CMAKE_GENERATOR="MinGW Makefiles"