diff --git a/.github/amd64 b/.github/amd64
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/.github/amd64
@@ -0,0 +1 @@
+3
diff --git a/.github/build-canary-v3 b/.github/build-canary-v3
deleted file mode 100644
index 56a6051..0000000
--- a/.github/build-canary-v3
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/.github/build-nest-i386 b/.github/build-nest-i386
deleted file mode 100644
index 56a6051..0000000
--- a/.github/build-nest-i386
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/.github/build-nest-v3 b/.github/build-nest-v3
deleted file mode 100644
index 56a6051..0000000
--- a/.github/build-nest-v3
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/.github/build-canary-i386 b/.github/i386
similarity index 100%
rename from .github/build-canary-i386
rename to .github/i386
diff --git a/.github/release-canary-i386 b/.github/release-canary-i386
deleted file mode 100644
index 56a6051..0000000
--- a/.github/release-canary-i386
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/.github/release-canary-v3 b/.github/release-canary-v3
deleted file mode 100644
index 0cfbf08..0000000
--- a/.github/release-canary-v3
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.github/release-nest-i386 b/.github/release-nest-i386
deleted file mode 100644
index 56a6051..0000000
--- a/.github/release-nest-i386
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/.github/release-nest-v3 b/.github/release-nest-v3
deleted file mode 100644
index 56a6051..0000000
--- a/.github/release-nest-v3
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/amd64.yml
similarity index 83%
rename from .github/workflows/release-nestv3.yml
rename to .github/workflows/amd64.yml
index ed42bb7..3917ad4 100644
--- a/.github/workflows/release-nestv3.yml
+++ b/.github/workflows/amd64.yml
@@ -1,17 +1,17 @@
-name: PikaOS Package Build & Release (amd64-v3)
+name: PikaOS Package Build & Release amd64
 
 on:
   push:
     branches:
       - main
     paths:
-      - '.github/release-nest-v3'
+      - '.github/amd64'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
+      image: ghcr.io/pikaos-linux/pika-base-debian-container:latest
       volumes:
         - /proc:/proc
       options: --privileged -it
diff --git a/.github/workflows/build-canaryi386.yml b/.github/workflows/build-canaryi386.yml
deleted file mode 100644
index 5d3fcb7..0000000
--- a/.github/workflows/build-canaryi386.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (Canary) (i386)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-canary-i386'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386
-      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/i386.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml
deleted file mode 100644
index bff3d86..0000000
--- a/.github/workflows/build-canaryv3.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (Canary) (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-canary-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
-      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/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
diff --git a/.github/workflows/build-nesti386.yml b/.github/workflows/build-nesti386.yml
deleted file mode 100644
index 10c1653..0000000
--- a/.github/workflows/build-nesti386.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (i386)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-nest-i386'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nesti386
-      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/i386.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml
deleted file mode 100644
index 3c9c34d..0000000
--- a/.github/workflows/build-nestv3.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-nest-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
-      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/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
diff --git a/.github/workflows/release-nesti386.yml b/.github/workflows/i386.yml
similarity index 83%
rename from .github/workflows/release-nesti386.yml
rename to .github/workflows/i386.yml
index 126d643..c65a640 100644
--- a/.github/workflows/release-nesti386.yml
+++ b/.github/workflows/i386.yml
@@ -1,17 +1,17 @@
-name: PikaOS Package Build & Release (i386)
+name: PikaOS Package Build & Release i386
 
 on:
   push:
     branches:
       - main
     paths:
-      - '.github/release-nest-i386'
+      - '.github/i386'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nesti386
+      image: ghcr.io/pikaos-linux/pika-base-debian-container:i386
       volumes:
         - /proc:/proc
       options: --privileged -it
diff --git a/.github/workflows/release-canaryi386.yml b/.github/workflows/release-canaryi386.yml
deleted file mode 100644
index 653861d..0000000
--- a/.github/workflows/release-canaryi386.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (Canary) (i386)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-canary-i386'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386
-      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/i386.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh
diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml
deleted file mode 100644
index 436c8ff..0000000
--- a/.github/workflows/release-canaryv3.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (Canary) (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-canary-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
-      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/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh