diff --git a/.github/workflows/i386-native.yml b/.github/workflows/i386-native.yml
new file mode 100644
index 000000000..1702b9ceb
--- /dev/null
+++ b/.github/workflows/i386-native.yml
@@ -0,0 +1,40 @@
+name: PikaOS Upstream Package Build & Release (i386)
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'pika-build-config/i386.sh'
+
+jobs:
+  build:
+    runs-on: upstream-package
+    container:
+      image: ghcr.io/pikaos-linux/pika-base-debian-container:i386
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - name: Update APT Cache
+      run: apt-get update -y
+
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/i386setup.sh ./pika-build-config.sh
+
+    - name: Build Package
+      run: ./main.sh
+
+    - name: Release Package
+      run: ./release.sh
diff --git a/.github/workflows/i386.yml b/.github/workflows/i386.yml
index 1702b9ceb..74c257e21 100644
--- a/.github/workflows/i386.yml
+++ b/.github/workflows/i386.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: upstream-package
     container:
-      image: ghcr.io/pikaos-linux/pika-base-debian-container:i386
+      image: ghcr.io/pikaos-linux/pika-base-debian-container:latest
       volumes:
         - /proc:/proc
       options: --privileged -it
@@ -26,15 +26,9 @@ jobs:
         name: id_rsa
         known_hosts: ${{ secrets.KNOWN_HOSTS }}
         if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/i386setup.sh ./pika-build-config.sh
 
     - name: Build Package
-      run: ./main.sh
+      run: ./main_pbuilder.sh
 
     - name: Release Package
       run: ./release.sh
diff --git a/main_pbuilder.sh b/main_pbuilder.sh
new file mode 100755
index 000000000..7d0ddd1ef
--- /dev/null
+++ b/main_pbuilder.sh
@@ -0,0 +1,23 @@
+#! /bin/bash
+
+set -e
+
+. ./pika-build-config.sh
+
+VERSION="$PIKA_PACKAGE_VERSION"
+
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
+
+# Get source code
+if [[ "$PIKA_PACKAGE_NAME" == *-dmo ]];
+then
+	apt-get source "$PIKA_PACKAGE_NAME" -y
+else
+	apt-get source "$PIKA_PACKAGE_NAME=$VERSION" -y
+fi
+
+pika-pbuilder-i386-build ./*.dsc
+
+# Move the debs to output
+mkdir -p ./output
+mv ./*.deb ./output/