diff --git a/.github/workflows/build-canaryi386.yml b/.github/workflows/build-canaryi386.yml
new file mode 100644
index 0000000..27c6068
--- /dev/null
+++ b/.github/workflows/build-canaryi386.yml
@@ -0,0 +1,34 @@
+name: PikaOS Package Build Only (Canary) (i386)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+  
+    - name: Import GPG key
+      id: import_gpg
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+
+    - 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: Build Package
+      run: ./maini386.sh
diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml
new file mode 100644
index 0000000..61fbee7
--- /dev/null
+++ b/.github/workflows/build-canaryv3.yml
@@ -0,0 +1,34 @@
+name: PikaOS Package Build Only (Canary) (amd64-v3)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+  
+    - name: Import GPG key
+      id: import_gpg
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+
+    - 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: Build Package
+      run: ./mainv3.sh
diff --git a/.github/workflows/build-nesti386.yml b/.github/workflows/build-nesti386.yml
new file mode 100644
index 0000000..23022bf
--- /dev/null
+++ b/.github/workflows/build-nesti386.yml
@@ -0,0 +1,34 @@
+name: PikaOS Package Build Only (i386)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nesti386
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+  
+    - name: Import GPG key
+      id: import_gpg
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+
+    - 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: Build Package
+      run: ./maini386.sh
diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml
new file mode 100644
index 0000000..0d013ba
--- /dev/null
+++ b/.github/workflows/build-nestv3.yml
@@ -0,0 +1,34 @@
+name: PikaOS Package Build Only (amd64-v3)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+  
+    - name: Import GPG key
+      id: import_gpg
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+
+    - 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: Build Package
+      run: ./mainv3.sh
diff --git a/.github/workflows/release.yml b/.github/workflows/release-canaryi386.yml
similarity index 79%
rename from .github/workflows/release.yml
rename to .github/workflows/release-canaryi386.yml
index fba6256..a4c3f5c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release-canaryi386.yml
@@ -1,4 +1,4 @@
-name: PikaOS Package Release
+name: PikaOS Package Build & Release (Canary) (i386)
 
 on:
   workflow_dispatch
@@ -7,14 +7,14 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nest
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386
       volumes:
         - /proc:/proc
       options: --privileged -it
 
     steps:
     - uses: actions/checkout@v3
-    
+  
     - name: Import GPG key
       id: import_gpg
       uses: crazy-max/ghaction-import-gpg@v5
@@ -29,13 +29,9 @@ jobs:
         name: id_rsa
         known_hosts: ${{ secrets.KNOWN_HOSTS }}
         if_key_exists: replace
-
-    - name: Update apt cache
-      run: apt-get update -y
     
     - name: Build Package
-      run: ./main.sh
+      run: ./maini386.sh
 
     - name: Release Package
       run: ./release.sh
-        
diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml
new file mode 100644
index 0000000..5b36604
--- /dev/null
+++ b/.github/workflows/release-canaryv3.yml
@@ -0,0 +1,37 @@
+name: PikaOS Package Build & Release (Canary) (amd64-v3)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+  
+    - name: Import GPG key
+      id: import_gpg
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+
+    - 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: Build Package
+      run: ./mainv3.sh
+
+    - name: Release Package
+      run: ./release.sh
diff --git a/.github/workflows/release-nesti386.yml b/.github/workflows/release-nesti386.yml
new file mode 100644
index 0000000..00292eb
--- /dev/null
+++ b/.github/workflows/release-nesti386.yml
@@ -0,0 +1,37 @@
+name: PikaOS Package Build & Release (i386)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nesti386
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+  
+    - name: Import GPG key
+      id: import_gpg
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+
+    - 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: Build Package
+      run: ./maini386.sh
+
+    - name: Release Package
+      run: ./release.sh
diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml
new file mode 100644
index 0000000..36a34fb
--- /dev/null
+++ b/.github/workflows/release-nestv3.yml
@@ -0,0 +1,37 @@
+name: PikaOS Package Build & Release (amd64-v3)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+  
+    - name: Import GPG key
+      id: import_gpg
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+
+    - 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: Build Package
+      run: ./mainv3.sh
+
+    - name: Release Package
+      run: ./release.sh
diff --git a/main.sh b/maini386.sh
similarity index 100%
rename from main.sh
rename to maini386.sh
diff --git a/mainv3.sh b/mainv3.sh
new file mode 100755
index 0000000..4fd7b08
--- /dev/null
+++ b/mainv3.sh
@@ -0,0 +1,19 @@
+#! /bin/bash
+
+DEBIAN_FRONTEND=noninteractive
+
+# Clone Upstream
+mkdir -p ./src-pkg-name
+cp -rvf ./debian ./src-pkg-name/
+cd ./src-pkg-name/
+
+# Get build deps
+apt-get build-dep ./ -y
+
+# Build package
+dpkg-buildpackage --no-sign
+
+# Move the debs to output
+cd ../
+mkdir -p ./output
+mv ./*.deb ./output/