diff --git a/.github/workflows/main.yml b/.github/workflows/bake_to_latest.yml
similarity index 95%
rename from .github/workflows/main.yml
rename to .github/workflows/bake_to_latest.yml
index f1b995e..6a2fbb3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/bake_to_latest.yml
@@ -1,16 +1,13 @@
-name: Build Image On Release
+name: Build release-tags
 
 on:
   workflow_dispatch:
   push:
     branches:
       - master
-  pull_request:
-    branches:
-      - master
 
 jobs:
-  bake:
+  bake-latest:
     runs-on: ubuntu-latest
     permissions:
       packages: write
diff --git a/.github/workflows/bake_to_next.yml b/.github/workflows/bake_to_next.yml
new file mode 100644
index 0000000..8f6e43c
--- /dev/null
+++ b/.github/workflows/bake_to_next.yml
@@ -0,0 +1,50 @@
+name: Build next-tags
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - next
+
+jobs:
+  bake-next:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1.6.0
+      - name: Login to DockerHub
+        uses: docker/login-action@v1.10.0
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1.10.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/docker-py3-kms/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
+          push: true
+          tags: pykmsorg/py-kms:python3-next,ghcr.io/py-kms-organization/py-kms:python3-next
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/docker-py3-kms-minimal/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
+          push: true
+          tags: pykmsorg/py-kms:latest-next,ghcr.io/py-kms-organization/py-kms:latest-next,pykmsorg/py-kms:minimal-next,ghcr.io/py-kms-organization/py-kms:minimal-next
diff --git a/.github/workflows/bake_to_test.yml b/.github/workflows/bake_to_test.yml
new file mode 100644
index 0000000..4daf711
--- /dev/null
+++ b/.github/workflows/bake_to_test.yml
@@ -0,0 +1,32 @@
+name: Test-Build Docker Image
+
+on:
+  workflow_dispatch:
+  push:
+
+jobs:
+  bake-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1.6.0
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/docker-py3-kms/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
+          push: false
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/docker-py3-kms-minimal/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
+          push: false
\ No newline at end of file