diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
deleted file mode 100644
index 584fad9..0000000
--- a/.github/workflows/build-main.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Build Main Container
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "build/**"
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        tag: ['latest']
-    steps:
-      - name: Checkout Codebase
-        uses: actions/checkout@v4
-
-      - name: Login to ghcr.io
-        run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u soup-bowl --password-stdin
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_SECRET }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build Container
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          context: "{{defaultContext}}:build/${{ matrix.tag }}"
-          tags: >
-            soupbowl/opensimulator:${{ matrix.tag }},
-            ghcr.io/soup-bowl/opensimulator-docker:${{ matrix.tag }},
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build.yml
similarity index 56%
rename from .github/workflows/build-beta.yml
rename to .github/workflows/build.yml
index 6da67c9..0e97eba 100644
--- a/.github/workflows/build-beta.yml
+++ b/.github/workflows/build.yml
@@ -1,10 +1,11 @@
-name: Build Beta Container
+name: Build Images
 
 on:
   push:
     branches:
       - main
     paths:
+      - "build/**"
       - "beta/**"
   schedule:
     - cron: '0 0 * * 0'
@@ -15,7 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tag: ['alpine-beta', 'source']
+        tag:
+            - '{ "tag": "latest", "folder": "build/latest", "platforms": "linux/amd64,linux/arm64" }'
+            - '{ "tag": "alpine-beta", "folder": "beta/alpine", "platforms": "linux/amd64,linux/arm64" }'
+            - '{ "tag": "source", "folder": "beta/source", "platforms": "linux/amd64,linux/arm64" }'
     steps:
       - name: Checkout Codebase
         uses: actions/checkout@v4
@@ -37,13 +41,14 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build Container
+        if: github.event_name != 'schedule' || fromJSON(matrix.tag).tag == 'source'
         uses: docker/build-push-action@v5
         with:
           push: true
-          context: "{{defaultContext}}:beta/${{ matrix.tag }}"
+          context: "{{defaultContext}}:${{ fromJSON(matrix.tag).folder }}"
           tags: >
-            soupbowl/opensimulator:${{ matrix.tag }},
-            ghcr.io/soup-bowl/opensimulator-docker:${{ matrix.tag }}
-          platforms: linux/amd64,linux/arm64
+            soupbowl/opensimulator:${{ fromJSON(matrix.tag).tag }},
+            ghcr.io/soup-bowl/opensimulator-docker:${{ fromJSON(matrix.tag).tag }},
+          platforms: ${{ fromJSON(matrix.tag).platforms }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/beta/alpine-beta/Dockerfile b/beta/alpine/Dockerfile
similarity index 100%
rename from beta/alpine-beta/Dockerfile
rename to beta/alpine/Dockerfile
diff --git a/beta/alpine-beta/defaults/OpenSim.ini b/beta/alpine/defaults/OpenSim.ini
similarity index 100%
rename from beta/alpine-beta/defaults/OpenSim.ini
rename to beta/alpine/defaults/OpenSim.ini
diff --git a/beta/alpine-beta/defaults/SQLiteStandalone.ini b/beta/alpine/defaults/SQLiteStandalone.ini
similarity index 100%
rename from beta/alpine-beta/defaults/SQLiteStandalone.ini
rename to beta/alpine/defaults/SQLiteStandalone.ini
diff --git a/beta/alpine-beta/defaults/StandaloneCommon.ini b/beta/alpine/defaults/StandaloneCommon.ini
similarity index 100%
rename from beta/alpine-beta/defaults/StandaloneCommon.ini
rename to beta/alpine/defaults/StandaloneCommon.ini
diff --git a/beta/alpine-beta/docker-compose.yml b/beta/alpine/docker-compose.yml
similarity index 100%
rename from beta/alpine-beta/docker-compose.yml
rename to beta/alpine/docker-compose.yml
diff --git a/beta/alpine-beta/docker-entrypoint.sh b/beta/alpine/docker-entrypoint.sh
similarity index 100%
rename from beta/alpine-beta/docker-entrypoint.sh
rename to beta/alpine/docker-entrypoint.sh