diff --git a/.github/release-canary-v3 b/.github/release-canary-v3
index b8626c4..7ed6ff8 100644
--- a/.github/release-canary-v3
+++ b/.github/release-canary-v3
@@ -1 +1 @@
-4
+5
diff --git a/main.sh b/main.sh
index bc3d1d7..71dfe48 100755
--- a/main.sh
+++ b/main.sh
@@ -8,12 +8,6 @@ source ./pika-build-config.sh
 
 echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
-# Clone Upstream
-git clone https://github.com/an-anime-team/an-anime-game-launcher -b "$VERSION"
-cp -rvf ./debian ./an-anime-game-launcher/
-cp -rvf ./an-anime-game-launcher.desktop ./an-anime-game-launcher/
-cd ./an-anime-game-launcher/
-
 # Get build deps
 apt-get build-dep ./ -y
 apt-get install curl -y
@@ -48,33 +42,32 @@ mkdir -p ../alvr
 cp -rvf ../debian ../alvr/
 
 # Make ALVR Dir
-install -Dm644 LICENSE -t "../alvr/usr/share/licenses/alvr/"
+install -Dm644 LICENSE -t "../alvr/usr/share/licenses/$pkgname/"
 install -Dm755 target/release/alvr_dashboard -t "../alvr/usr/bin/"
 
 # vrcompositor wrapper
-install -Dm755 target/release/alvr_vrcompositor_wrapper "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/alvr/vrcompositor-wrapper"
+install -Dm755 target/release/alvr_vrcompositor_wrapper "../alvr/usr/lib/alvr/vrcompositor-wrapper"
+install -Dm644 target/release/alvr_drm_lease_shim.so "../alvr/usr/lib/alvr/alvr_drm_lease_shim.so"
 
 # OpenVR Driver
-install -Dm644 target/release/libalvr_server.so "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/steamvr/alvr/bin/linux64/driver_alvr_server.so"
-install -Dm644 alvr/xtask/resources/driver.vrdrivermanifest -t "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/steamvr/alvr/"
+install -Dm644 target/release/libalvr_server.so "../alvr/usr/lib/steamvr/alvr/bin/linux64/driver_alvr_server.so"
+install -Dm644 alvr/xtask/resources/driver.vrdrivermanifest -t "../alvr/usr/lib/steamvr/alvr/"
 
 # Vulkan Layer
-install -Dm644 target/release/libalvr_vulkan_layer.so -t "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/"
+install -Dm644 target/release/libalvr_vulkan_layer.so -t "../alvr/usr/lib/"
 install -Dm644 alvr/vulkan_layer/layer/alvr_x86_64.json -t "../alvr/usr/share/vulkan/explicit_layer.d/"
 
 # Desktop
-install -Dm644 alvr/xtask/resources/alvr.desktop -t "../alvr/usr/share/applications"
-
+install -Dm644 "alvr/xtask/resources/$pkgname.desktop" -t "../alvr/usr/share/applications"
 
 # Icons
 install -d ../alvr/usr/share/icons/hicolor/{16x16,32x32,48x48,64x64,128x128,256x256}/apps/
 cp -ar icons/* ../alvr/usr/share/icons/
 
 # Firewall
-install -Dm644 "alvr/xtask/firewall/alvr-firewalld.xml" "../alvr/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/firewalld/services/alvr.xml"
-install -Dm644 "alvr/xtask/firewall/ufw-alvr" -t "../alvr/etc/ufw/applications.d/"
+install -Dm644 alvr/xtask/firewall/ufw-alvr -t "../alvr/etc/ufw/applications.d/"
 
-install -Dm755 "alvr/xtask/firewall/alvr_fw_config.sh" -t "../alvr/usr/share/alvr/"
+install -Dm755 alvr/xtask/firewall/alvr_fw_config.sh -t "../alvr/usr/share/alvr/"
 
 cd ../alvr