diff --git a/.github/workflows/build-canaryi386.yml b/.github/workflows/build-canaryi386.yml
index 9386522..8996dc0 100644
--- a/.github/workflows/build-canaryi386.yml
+++ b/.github/workflows/build-canaryi386.yml
@@ -30,5 +30,8 @@ jobs:
     - name: Update APT Cache
       run: apt-get update -y
 
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
+
     - name: Build Package
-      run: ./maini386.sh
+      run: ./main.sh
diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml
index 72adde7..25f3de9 100644
--- a/.github/workflows/build-canaryv3.yml
+++ b/.github/workflows/build-canaryv3.yml
@@ -30,5 +30,8 @@ jobs:
     - name: Update APT Cache
       run: apt-get update -y
 
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+
     - name: Build Package
-      run: ./mainv3.sh
+      run: ./main.sh
diff --git a/.github/workflows/build-nesti386.yml b/.github/workflows/build-nesti386.yml
index bccbfbe..5cf59d5 100644
--- a/.github/workflows/build-nesti386.yml
+++ b/.github/workflows/build-nesti386.yml
@@ -30,5 +30,8 @@ jobs:
     - name: Update APT Cache
       run: apt-get update -y
 
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
+
     - name: Build Package
-      run: ./maini386.sh
+      run: ./main.sh
diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml
index 3098818..80a4e86 100644
--- a/.github/workflows/build-nestv3.yml
+++ b/.github/workflows/build-nestv3.yml
@@ -30,5 +30,8 @@ jobs:
     - name: Update APT Cache
       run: apt-get update -y
 
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+
     - name: Build Package
-      run: ./mainv3.sh
+      run: ./main.sh
diff --git a/.github/workflows/release-canaryi386.yml b/.github/workflows/release-canaryi386.yml
index 033506f..5b7f7c3 100644
--- a/.github/workflows/release-canaryi386.yml
+++ b/.github/workflows/release-canaryi386.yml
@@ -30,8 +30,11 @@ jobs:
     - name: Update APT Cache
       run: apt-get update -y
 
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
+
     - name: Build Package
-      run: ./maini386.sh
+      run: ./main.sh
 
     - name: Release Package
       run: ./release.sh
diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml
index 3e837ff..895def8 100644
--- a/.github/workflows/release-canaryv3.yml
+++ b/.github/workflows/release-canaryv3.yml
@@ -30,8 +30,11 @@ jobs:
     - name: Update APT Cache
       run: apt-get update -y
 
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+
     - name: Build Package
-      run: ./mainv3.sh
+      run: ./main.sh
 
     - name: Release Package
       run: ./release.sh
diff --git a/.github/workflows/release-nesti386.yml b/.github/workflows/release-nesti386.yml
index 5556233..839db27 100644
--- a/.github/workflows/release-nesti386.yml
+++ b/.github/workflows/release-nesti386.yml
@@ -30,8 +30,11 @@ jobs:
     - name: Update APT Cache
       run: apt-get update -y
 
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
+
     - name: Build Package
-      run: ./maini386.sh
+      run: ./main.sh
 
     - name: Release Package
       run: ./release.sh
diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml
index bb9261e..a1aa799 100644
--- a/.github/workflows/release-nestv3.yml
+++ b/.github/workflows/release-nestv3.yml
@@ -30,8 +30,11 @@ jobs:
     - name: Update APT Cache
       run: apt-get update -y
 
+    - name: Set Build Config
+      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
+
     - name: Build Package
-      run: ./mainv3.sh
+      run: ./main.sh
 
     - name: Release Package
       run: ./release.sh
diff --git a/maini386.sh b/main.sh
similarity index 79%
rename from maini386.sh
rename to main.sh
index d8d756f..4ed6086 100755
--- a/maini386.sh
+++ b/main.sh
@@ -4,11 +4,9 @@ set -e
 
 source ./version.sh
 
-DRIVER_ARCH="Linux-x86_64"
+source ./pika-build-config.sh
 
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
 # Get nvidia run file
 cd ./nvidia-graphics-drivers-"$DRIVER_VERSION_MAJOR"
diff --git a/mainv3.sh b/mainv3.sh
deleted file mode 100755
index 01471f3..0000000
--- a/mainv3.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/bash
-
-set -e
-
-source ./version.sh
-
-DRIVER_ARCH="Linux-x86_64"
-
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0
-
-# Get nvidia run file
-cd ./nvidia-graphics-drivers-"$DRIVER_VERSION_MAJOR"
-wget https://us.download.nvidia.com/XFree86/$DRIVER_ARCH/$DRIVER_VERSION_FULL/NVIDIA-$DRIVER_ARCH-$DRIVER_VERSION_FULL.run -O nvidia-installer.run
-chmod +x nvidia-installer.run
-
-# Get build deps
-apt-get build-dep ./ -y
-
-# Build package
-LOGNAME=root dh_make --createorig -y -l -p nvidia-graphics-drivers-"$DRIVER_VERSION_MAJOR"_"$DRIVER_VERSION_FULL" || true
-dpkg-buildpackage --no-sign
-
-# Move the debs to output
-cd ../
-mkdir -p ./output
-mv ./*.deb ./output/
diff --git a/nvidia-graphics-drivers-560/debian/rules b/nvidia-graphics-drivers-560/debian/rules
index e2eda97..52f7365 100644
--- a/nvidia-graphics-drivers-560/debian/rules
+++ b/nvidia-graphics-drivers-560/debian/rules
@@ -3,6 +3,7 @@
 ## See debhelper(7) (uncomment to enable).
 ## Output every command that modifies files on the build system.
 export DH_VERBOSE = 1
+export PIKA_BUILD_ARCH = $(shell cat pika-build-arch)
 
 override_dh_prep:
 # amd64 build prep
diff --git a/pika-build-config/amd64-v3.sh b/pika-build-config/amd64-v3.sh
new file mode 100755
index 0000000..1bad467
--- /dev/null
+++ b/pika-build-config/amd64-v3.sh
@@ -0,0 +1,10 @@
+PIKA_BUILD_ARCH="amd64-v3"
+DEBIAN_FRONTEND="noninteractive"
+DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+DEB_BUILD_OPTIONS="nocheck notest terse"
+DPKG_GENSYMBOLS_CHECK_LEVEL=0
+DRIVER_ARCH="Linux-x86_64"
diff --git a/pika-build-config/i386.sh b/pika-build-config/i386.sh
new file mode 100755
index 0000000..8378867
--- /dev/null
+++ b/pika-build-config/i386.sh
@@ -0,0 +1,5 @@
+PIKA_BUILD_ARCH="i386"
+DEBIAN_FRONTEND="noninteractive"
+DEB_BUILD_OPTIONS="nocheck notest terse"
+DPKG_GENSYMBOLS_CHECK_LEVEL=0
+DRIVER_ARCH="Linux-x86_64"