diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 447eedc..9d738f4 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -65,10 +65,15 @@ jobs:
           name: build-output-linux
           path: build/linux/x64/release/bundle
       - name: Build AppImage
-        uses: docker://appimagecrafters/appimage-builder:0.8.5
-        with:
-          entrypoint: appimage-builder
-          args: --recipe ./AppImageBuilder.yml --skip-test
+        run: |
+          rm -r Solian.AppDir | true
+          mkdir Solian.AppDir
+          cp -r build/linux/x64/release/bundle/* Solian.AppDir
+          cp -r buildtools/appimage_config/* Solian.AppDir
+          cp assets/icon/icon-light-radius.png Solian.AppDir
+          sudo chmod +x buildtools/appimagetool-x86_64.AppImage
+          sudo chmod +x Solian.AppDir/AppRun
+          ./buildtools/appimagetool-x86_64.AppImage Solian.AppDir
       - name: Archive production artifacts
         uses: actions/upload-artifact@v4
         with:
diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml
deleted file mode 100644
index 72fa1e8..0000000
--- a/AppImageBuilder.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
-version: 1
-script:
- - rm -rf AppDir || true
- - cp -r build/linux/x64/release/bundle AppDir
- - mkdir -p AppDir/usr/share/icons/hicolor/64x64/apps/
- - cp assets/icon/icon-light-radius.png AppDir/usr/share/icons/hicolor/64x64/apps/
-AppDir:
-  path: ./AppDir
-  app_info:
-    id: dev.solsynth.solian
-    name: Solian surface
-    icon: icon-light-radius
-    version: latest
-    exec: surface
-    exec_args: $@
-  apt:
-    arch: amd64
-    allow_unauthenticated: true
-    sources:
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic main restricted
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic universe
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-updates universe
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic multiverse
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-updates multiverse
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
-    - sourceline: deb http://security.ubuntu.com/ubuntu bionic-security main restricted
-    - sourceline: deb http://security.ubuntu.com/ubuntu bionic-security universe
-    - sourceline: deb http://security.ubuntu.com/ubuntu bionic-security multiverse
-    include:
-    - libgtk-3-0
-    - squashfs-tools
-    exclude:
-    - humanity-icon-theme
-    - hicolor-icon-theme
-    - adwaita-icon-theme
-    - ubuntu-mono
-  files:
-    exclude:
-    - usr/share/man
-    - usr/share/doc/*/README.*
-    - usr/share/doc/*/changelog.*
-    - usr/share/doc/*/NEWS.*
-    - usr/share/doc/*/TODO.*
-  runtime:
-    env:
-      GIO_MODULE_DIR: $APPDIR/usr/lib/x86_64-linux-gnu/gio/modules/
-  test:
-    fedora:
-      image: appimagecrafters/tests-env:fedora-30
-      command: ./AppRun
-      use_host_x: true
-    debian:
-      image: appimagecrafters/tests-env:debian-stable
-      command: ./AppRun
-      use_host_x: true
-    arch:
-      image: appimagecrafters/tests-env:archlinux-latest
-      command: ./AppRun
-      use_host_x: true
-    centos:
-      image: appimagecrafters/tests-env:centos-7
-      command: ./AppRun
-      use_host_x: true
-    ubuntu:
-      image: appimagecrafters/tests-env:ubuntu-xenial
-      command: ./AppRun
-      use_host_x: true
-AppImage:
-  arch: x86_64
-  update-information: guess
-  sign-key: None
diff --git a/buildtools/appimage_config/AppRun b/buildtools/appimage_config/AppRun
new file mode 100755
index 0000000..883be61
--- /dev/null
+++ b/buildtools/appimage_config/AppRun
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd "$(dirname "$0")"
+exec ./surface
diff --git a/buildtools/appimage_config/Solian.desktop b/buildtools/appimage_config/Solian.desktop
new file mode 100644
index 0000000..8fc249b
--- /dev/null
+++ b/buildtools/appimage_config/Solian.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Name=Solian
+Exec=surface %u
+Icon=icon-light-radius
+Categories=Network;
diff --git a/buildtools/appimagetool-x86_64.AppImage b/buildtools/appimagetool-x86_64.AppImage
new file mode 100755
index 0000000..f682962
Binary files /dev/null and b/buildtools/appimagetool-x86_64.AppImage differ