diff --git a/.github/workflows/release_i386.yml b/.github/workflows/release_i386.yml
index d7363ba..95ad57c 100644
--- a/.github/workflows/release_i386.yml
+++ b/.github/workflows/release_i386.yml
@@ -7,16 +7,13 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ubuntu:23.04
+      image: ghcr.io/pikaos-linux/pika-i386-package-container:latest
       volumes:
         - /proc:/proc
       options: --privileged -it
 
     steps:
     - uses: actions/checkout@v3
-  
-    - name: Install needed packages
-      run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y
 
     - name: Import GPG key
       id: import_gpg
@@ -34,7 +31,7 @@ jobs:
         if_key_exists: replace
     
     - name: Build Package
-      run: ./main32.sh
+      run: ./main.sh
 
     - name: Release Package
       run: ./release.sh
diff --git a/debian/mangoapp.install b/debian/mangoapp.install
index bea2063..b89b784 100644
--- a/debian/mangoapp.install
+++ b/debian/mangoapp.install
@@ -1,4 +1,4 @@
 usr/bin/mangoapp
 usr/lib/*/mangohud/libMangoApp.so
-usr/share/vulkan/implicit_layer.d/libMangoApp.json
+usr/share/vulkan/implicit_layer.d/*
 usr/share/man/man1/mangoapp.1
diff --git a/hooks/01pikarepo b/hooks/01pikarepo
deleted file mode 100644
index 4228281..0000000
--- a/hooks/01pikarepo
+++ /dev/null
@@ -1,2 +0,0 @@
-#echo "deb [trusted=yes] https://ppa.pika-os.com/ lunar main" >> /etc/apt/sources.list
-apt-get update
diff --git a/main.sh b/main.sh
index 8a9bd30..a85a11f 100755
--- a/main.sh
+++ b/main.sh
@@ -11,7 +11,7 @@ apt-get build-dep ./ -y
 
 LOGNAME=root dh_make --createorig -y -l -p mangohud_0.6.9.1
 
-dpkg-buildpackage
+dpkg-buildpackage --no-sign
 
 # Move the debs to output
 cd ../
diff --git a/main32.sh b/main32.sh
index 58b7947..a85a11f 100755
--- a/main32.sh
+++ b/main32.sh
@@ -1,37 +1,19 @@
-# Add dependent repositories
-sudo dpkg --add-architecture i386
-wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
-touch /etc/apt/sources.list.d/pika.list
-echo 'deb https://ppa.pika-os.com/ lunar main' > /etc/apt/sources.list.d/pika.list
-add-apt-repository ppa:pikaos/pika
-add-apt-repository ppa:kubuntu-ppa/backports
-apt update
 # Clone Upstream
 git clone https://github.com/flightlessmango/MangoHud -b v0.6.9-1
 mv ./MangoHud ./mangohud
 cp -rvf ./debian ./mangohud/
 cd ./mangohud
-LOGNAME=root dh_make --createorig -y -l -p mangohud_0.6.9.1
 
 # Get build deps
-ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
-DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
-apt-get build-dep -y ./
-debuild -S -uc -us
-cd ../
+apt-get build-dep ./ -y
 
-apt-get install -y pbuilder debootstrap devscripts debhelper sbuild debhelper ubuntu-dev-tools piuparts
+# Build package
 
-apt install -y debian-archive-keyring
-cp -rvf ./pbuilderrc /etc/pbuilderrc
-mkdir -p /var/cache/pbuilder/hook.d/
-cp -rvf ./hooks/* /var/cache/pbuilder/hook.d/
-rm -rf /var/cache/apt/
-mkdir -p /pbuilder-results
-DIST=lunar ARCH=i386 pbuilder create --distribution lunar --architecture i386 --debootstrapopts --include=ca-certificates
-echo 'starting build'
-DIST=lunar ARCH=i386 pbuilder build ./*.dsc --distribution lunar --architecture i386 --debootstrapopts --include=ca-certificates
+LOGNAME=root dh_make --createorig -y -l -p mangohud_0.6.9.1
+
+dpkg-buildpackage --no-sign
 
 # Move the debs to output
+cd ../
 mkdir -p ./output
-mv /var/cache/pbuilder/result/*.deb ./output/ || sudo mv ../*.deb ./output/
+mv ./*.deb ./output/
diff --git a/mangohud_0.6.8.orig.tar.xz b/mangohud_0.6.8.orig.tar.xz
deleted file mode 100644
index 928e98c..0000000
Binary files a/mangohud_0.6.8.orig.tar.xz and /dev/null differ
diff --git a/pbuilderrc b/pbuilderrc
deleted file mode 100644
index 5d7a733..0000000
--- a/pbuilderrc
+++ /dev/null
@@ -1,8 +0,0 @@
-USENETWORK=yes
-OTHERMIRROR="deb [trusted=yes] http://ppa.pika-os.com/ lunar main"
-HOOKDIR="/var/cache/pbuilder/hook.d/"
-APTCACHEHARDLINK=no
-export DEBIAN_FRONTEND="noninteractive"
-#OTHERMIRROR="deb [trusted=yes] https://ppa.pika-os.com/ lunar main"
-
-