diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2cf8ce8..fa9a600 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ubuntu:22.10
+      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 a83702f..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: ubuntu:22.10
+      image: ubuntu:23.04
       volumes:
         - /proc:/proc
       options: --privileged -it
diff --git a/debian/changelog b/debian/changelog
index 163694a..bfabe2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vkbasalt (1:0.3.2.9-99pika1.lunar) lunar; urgency=medium
+
+  * Update to lunar
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 15 Oct 2022 18:58:00 +0300
+
+
 vkbasalt (1:0.3.2.9-1) kinetic; urgency=medium
 
   * Initial Push to REPO
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/main.sh b/main.sh
index 9581965..c6729b3 100755
--- a/main.sh
+++ b/main.sh
@@ -13,7 +13,7 @@ cd ./vkbasalt
 apt-get build-dep ./ -y
 
 # Build package
-dpkg-buildpackage
+dpkg-buildpackage --no-sign
 
 # Move the debs to output
 cd ../
diff --git a/main32.sh b/main32.sh
index 4b8d167..ec92b4b 100755
--- a/main32.sh
+++ b/main32.sh
@@ -11,16 +11,24 @@ cp -rvf ./debian ./vkbasalt
 cd ./vkbasalt
 
 # 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 -y install meson pkg-config glslang-tools:i386 libx11-dev:i386 libvulkan-dev:i386 spirv-headers
+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/
\ No newline at end of file
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"
+
+