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/debian/rules b/debian/rules
index 58db983..3818cc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export PIKA_BUILD_ARCH = $(shell cat pika-build-arch)
 
 %:
 	dh $@
diff --git a/maini386.sh b/main.sh
similarity index 78%
rename from maini386.sh
rename to main.sh
index acfeebe..93f7e22 100755
--- a/maini386.sh
+++ b/main.sh
@@ -4,9 +4,9 @@ set -e
 
 VERSION="0.0.12"
 
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0
+source ./pika-build-config.sh
+
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
 # Clone Upstream
 git clone https://github.com/elFarto/nvidia-vaapi-driver -b v"$VERSION"
diff --git a/mainv3.sh b/mainv3.sh
deleted file mode 100755
index 4049f4a..0000000
--- a/mainv3.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/bash
-
-set -e
-
-VERSION="0.0.12"
-
-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
-
-# Clone Upstream
-git clone https://github.com/elFarto/nvidia-vaapi-driver -b v"$VERSION"
-cp -rvf ./debian ./nvidia-vaapi-driver/
-cd ./nvidia-vaapi-driver
-
-# Get build deps
-apt-get build-dep ./ -y
-
-# Build package
-LOGNAME=root dh_make --createorig -y -l -p nvidia-vaapi-version_"$VERSION" || echo "dh-make: Ignoring Last Error"
-dpkg-buildpackage --no-sign
-
-# Move the debs to output
-cd ../
-mkdir -p ./output
-mv ./*.deb ./output/
diff --git a/pika-build-config/amd64-v3.sh b/pika-build-config/amd64-v3.sh
new file mode 100755
index 0000000..4547e43
--- /dev/null
+++ b/pika-build-config/amd64-v3.sh
@@ -0,0 +1,9 @@
+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
diff --git a/pika-build-config/i386.sh b/pika-build-config/i386.sh
new file mode 100755
index 0000000..9a76b13
--- /dev/null
+++ b/pika-build-config/i386.sh
@@ -0,0 +1,4 @@
+PIKA_BUILD_ARCH="i386"
+DEBIAN_FRONTEND="noninteractive"
+DEB_BUILD_OPTIONS="nocheck notest terse"
+DPKG_GENSYMBOLS_CHECK_LEVEL=0