diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fbd921f..fa9a600 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: debian:sid
+      image: ubuntu:23.04
       volumes:
         - /proc:/proc
       options: --privileged -it
diff --git a/.github/workflows/release_i386.yml b/.github/workflows/release_i386.yml
index f291f37..4701977 100644
--- a/.github/workflows/release_i386.yml
+++ b/.github/workflows/release_i386.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: debian:sid
+      image: ubuntu:23.04
       volumes:
         - /proc:/proc
       options: --privileged -it
diff --git a/debian/changelog b/debian/changelog
index 6a93a20..0d04f1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mangohud (1:0.6.8-99pika7.lunar) lunar; urgency=medium
+mangohud (1:0.6.8-99pika8.lunar) lunar; urgency=medium
 
   * Initial Push to PPA
 
diff --git a/debian/control b/debian/control
index 47fbb3a..034be40 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper-compat (= 13),
                libwayland-dev,
                libxnvctrl-dev,
                libxrandr-dev,
-               python3-mako [!i386],
+               python3-mako,
                python3-setuptools,
 Rules-Requires-Root: no
 Standards-Version: 4.6.1
diff --git a/hooks/01pikarepo b/hooks/01pikarepo
new file mode 100644
index 0000000..4228281
--- /dev/null
+++ b/hooks/01pikarepo
@@ -0,0 +1,2 @@
+#echo "deb [trusted=yes] https://ppa.pika-os.com/ lunar main" >> /etc/apt/sources.list
+apt-get update
diff --git a/main32.sh b/main32.sh
index ffdcf59..042f1c9 100755
--- a/main32.sh
+++ b/main32.sh
@@ -13,16 +13,24 @@ cp -rvf ./debian ./mangohud/
 cd ./mangohud
 
 # Get build deps
-apt-get install build-essential -y
-apt-get install crossbuild-essential-i386 lib32gcc-11-dev -y
-apt-get build-dep ./ -y -a i386
-apt-get install python3-mako -y
+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 ../
 
-# Build package
-dpkg-buildpackage -a i386
+apt-get install -y pbuilder debootstrap devscripts debhelper sbuild debhelper ubuntu-dev-tools piuparts
+
+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
 
 # Move the debs to output
-cd ../
 mkdir -p ./output
-mv ./*.deb ./output/
-
+mv /var/cache/pbuilder/result/*.deb ./output/ || sudo mv ../*.deb ./output/
diff --git a/pbuilderrc b/pbuilderrc
new file mode 100644
index 0000000..5d7a733
--- /dev/null
+++ b/pbuilderrc
@@ -0,0 +1,8 @@
+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"
+
+