diff --git a/.github/workflows/ghcr_amd64.yml b/.github/workflows/ghcr.yml
similarity index 50%
rename from .github/workflows/ghcr_amd64.yml
rename to .github/workflows/ghcr.yml
index f230a750..09b71bc8 100644
--- a/.github/workflows/ghcr_amd64.yml
+++ b/.github/workflows/ghcr.yml
@@ -1,4 +1,4 @@
-name: "amd64 images"
+name: Build and Push to GHCR
 
 on:
   push:
@@ -7,13 +7,14 @@ on:
 
 jobs:
   build-base:
+    name: Build Base Image
     uses: ./.github/workflows/image_base.yml
     with:
-      platforms: linux/amd64
-      dockerfile: Dockerfile
+      platforms: linux/amd64,linux/arm64,linux/arm/v7
     secrets: inherit
 
   build-apps:
+    name: Build Apps Image
     uses: ./.github/workflows/image_app.yml
     needs: build-base
     strategy:
@@ -22,21 +23,34 @@ jobs:
       matrix:
         include:
           - name: firefox
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
           - name: waterfox
+            platforms: linux/amd64
           - name: chromium
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
           - name: google-chrome
+            platforms: linux/amd64
           - name: ungoogled-chromium
+            platforms: linux/amd64
           - name: microsoft-edge
+            platforms: linux/amd64
           - name: brave
+            platforms: linux/amd64
           - name: vivaldi
+            platforms: linux/amd64
           - name: opera
+            platforms: linux/amd64
           - name: tor-browser
+            platforms: linux/amd64
           - name: remmina
+            platforms: linux/amd64
           - name: vlc
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
           - name: xfce
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
           - name: kde
+            platforms: linux/amd64
     with:
       name: ${{ matrix.name }}
-      dockerfile: ${{ matrix.dockerfile }}
-      platforms: linux/amd64
+      platforms: ${{ matrix.platforms }}
     secrets: inherit
diff --git a/.github/workflows/ghcr_arm.yml b/.github/workflows/ghcr_arm.yml
deleted file mode 100644
index 23c5f63c..00000000
--- a/.github/workflows/ghcr_arm.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: "arm64v8 and arm32v7 images"
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  build-base:
-    uses: ./.github/workflows/image_base.yml
-    with:
-      flavor: arm
-      platforms: linux/arm64,linux/arm/v7
-      dockerfile: Dockerfile
-    secrets: inherit
-
-  build-apps:
-    uses: ./.github/workflows/image_app.yml
-    needs: build-base
-    strategy:
-      # Will build all images even if some fail.
-      fail-fast: false
-      matrix:
-        include:
-          - name: firefox
-          - name: chromium
-          - name: vlc
-          - name: xfce
-    with:
-      name: ${{ matrix.name }}
-      dockerfile: ${{ matrix.dockerfile }}
-      flavor: arm
-      platforms: linux/arm64,linux/arm/v7
-    secrets: inherit
diff --git a/.github/workflows/ghcr_intel.yml b/.github/workflows/ghcr_intel.yml
index 332da3b0..dcfeac7f 100644
--- a/.github/workflows/ghcr_intel.yml
+++ b/.github/workflows/ghcr_intel.yml
@@ -1,4 +1,4 @@
-name: "intel gpu supported images"
+name: Build and Push to GHCR for Intel
 
 on:
   push:
@@ -7,6 +7,7 @@ on:
 
 jobs:
   build-base:
+    name: Build Base Image
     uses: ./.github/workflows/image_base.yml
     with:
       flavor: intel
@@ -15,6 +16,7 @@ jobs:
     secrets: inherit
 
   build-apps:
+    name: Build Apps Image
     uses: ./.github/workflows/image_app.yml
     needs: build-base
     strategy:
@@ -38,7 +40,7 @@ jobs:
           - name: kde
     with:
       name: ${{ matrix.name }}
-      dockerfile: ${{ matrix.dockerfile }}
       flavor: intel
       platforms: linux/amd64
+      dockerfile: ${{ matrix.dockerfile }}
     secrets: inherit
diff --git a/.github/workflows/ghcr_nvidia.yml b/.github/workflows/ghcr_nvidia.yml
index 6e1637df..ae444049 100644
--- a/.github/workflows/ghcr_nvidia.yml
+++ b/.github/workflows/ghcr_nvidia.yml
@@ -1,4 +1,4 @@
-name: "nvidia gpu supported images"
+name: Build and Push to GHCR for Nvidia
 
 on:
   push:
@@ -7,6 +7,7 @@ on:
 
 jobs:
   build-base:
+    name: Build Base Image
     uses: ./.github/workflows/image_base.yml
     with:
       flavor: nvidia
@@ -15,6 +16,7 @@ jobs:
     secrets: inherit
 
   build-apps:
+    name: Build Apps Image
     uses: ./.github/workflows/image_app.yml
     needs: build-base
     strategy:
@@ -34,7 +36,7 @@ jobs:
             dockerfile: Dockerfile.nvidia
     with:
       name: ${{ matrix.name }}
-      dockerfile: ${{ matrix.dockerfile }}
       flavor: nvidia
       platforms: linux/amd64
+      dockerfile: ${{ matrix.dockerfile }}
     secrets: inherit
diff --git a/.github/workflows/image_app.yml b/.github/workflows/image_app.yml
index 1e01dc12..e678536b 100644
--- a/.github/workflows/image_app.yml
+++ b/.github/workflows/image_app.yml
@@ -7,11 +7,6 @@ on:
         required: true
         type: string
         description: "The name of the application to build."
-      dockerfile:
-        required: false
-        type: string
-        default: "Dockerfile"
-        description: "The Dockerfile to use for building the image."
       flavor:
         required: false
         type: string
@@ -22,10 +17,11 @@ on:
         type: string
         default: "linux/amd64"
         description: "The platforms to build for."
-    secrets:
-      GHCR_ACCESS_TOKEN:
-        required: true
-        description: "GitHub Container Registry access token."
+      dockerfile:
+        required: false
+        type: string
+        default: "Dockerfile"
+        description: "The Dockerfile to use for building the image."
 
 env:
   FLAVOR_PREFIX: ${{ inputs.flavor && format('{0}-', inputs.flavor) || '' }}
diff --git a/.github/workflows/image_base.yml b/.github/workflows/image_base.yml
index 65ad6a07..8a45a366 100644
--- a/.github/workflows/image_base.yml
+++ b/.github/workflows/image_base.yml
@@ -3,11 +3,6 @@ name: Build and Publish Base Image
 on:
   workflow_call:
     inputs:
-      dockerfile:
-        required: false
-        type: string
-        default: "Dockerfile"
-        description: "The Dockerfile to use for building the image."
       flavor:
         required: false
         type: string
@@ -18,10 +13,11 @@ on:
         type: string
         default: "linux/amd64"
         description: "The platforms to build for."
-    secrets:
-      GHCR_ACCESS_TOKEN:
-        required: true
-        description: "GitHub Container Registry access token."
+      dockerfile:
+        required: false
+        type: string
+        default: "Dockerfile"
+        description: "The Dockerfile to use for building the image."
 
 env:
   FLAVOR_PREFIX: ${{ inputs.flavor && format('{0}-', inputs.flavor) || '' }}