diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
index 764894a..55b1488 100644
--- a/dependencies/CMakeLists.txt
+++ b/dependencies/CMakeLists.txt
@@ -8,11 +8,11 @@ endif()
 if(BUILD_ARM_COMPONENTS)
     add_subdirectory(libpng)
 endif()
-# GLFW
-if(BUILD_NATIVE_COMPONENTS)
-    add_subdirectory(glfw)
-endif()
 # Minecraft: Pi Edition
 if(BUILD_ARM_COMPONENTS AND NOT MCPI_OPEN_SOURCE_ONLY)
     add_subdirectory(minecraft-pi)
 endif()
+# GLFW
+if(BUILD_NATIVE_COMPONENTS AND NOT MCPI_HEADLESS_MODE)
+    add_subdirectory(glfw)
+endif()
diff --git a/scripts/generate-appimage-builder-yaml.js b/scripts/generate-appimage-builder-yaml.js
index c1fc57e..9e90714 100755
--- a/scripts/generate-appimage-builder-yaml.js
+++ b/scripts/generate-appimage-builder-yaml.js
@@ -50,8 +50,6 @@ const packageExclusions = [
     // Exclude Unneeded Packages
     'humanity-icon-theme',
     'adwaita-icon-theme',
-    'libwebkit2gtk-*',
-    'libnotify4',
     '*systemd*',
     'dconf-service',
     'dconf-gsettings-backend',
diff --git a/scripts/install-dependencies.sh b/scripts/install-dependencies.sh
index 4e04f24..43cc986 100755
--- a/scripts/install-dependencies.sh
+++ b/scripts/install-dependencies.sh
@@ -93,11 +93,16 @@ sudo apt-get install --no-install-recommends -y ${PKG_QUEUE}
 # Download appimagetool
 sudo mkdir -p /opt
 sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /opt/appimagetool
+sudo chmod +x /opt/appimagetool
 # Workaround AppImage Issues With Docker
-cd /opt; sudo chmod +x ./appimagetool; sudo sed -i '0,/AI\x02/{s|AI\x02|\x00\x00\x00|}' ./appimagetool; sudo ./appimagetool --appimage-extract
+cd /opt
+sudo sed -i '0,/AI\x02/{s|AI\x02|\x00\x00\x00|}' ./appimagetool
+sudo rm -rf /opt/squashfs-root /opt/appimagetool.AppDir
+sudo ./appimagetool --appimage-extract
+sudo rm -f ./appimagetool
 sudo mv /opt/squashfs-root /opt/appimagetool.AppDir
 sudo rm -f /usr/local/bin/appimagetool
 sudo ln -s /opt/appimagetool.AppDir/AppRun /usr/local/bin/appimagetool
 
 # Install appimage-builder
-sudo pip3 install 'git+https://github.com/AppImageCrafters/appimage-builder.git'
+sudo pip3 install 'git+https://github.com/TheBrokenRail/appimage-builder.git'