diff --git a/.github/workflows/build_base_alpine_dev.yaml b/.github/workflows/build_base_alpine_dev.yaml
deleted file mode 100644
index 3a8692bf..00000000
--- a/.github/workflows/build_base_alpine_dev.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-name: "Build base:alpine-core:dev"
-
-on:
-    workflow_dispatch:
-    workflow_call:
-    push:
-        branches:
-            - dev
-
-jobs:
-    docker:
-        runs-on: [self-hosted]
-        strategy:
-            matrix:
-                branch:
-                    - dev
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-              with:
-                  ref: ${{ matrix.branch }}
-
-            - uses: actions-ecosystem/action-get-latest-tag@v1
-              id: get-latest-tag
-              with:
-                  semver_only: true
-
-            - uses: cardinalby/export-env-action@v1
-              with:
-                  envFile: ".github_build/Build.alpine.env"
-                  export: "true"
-                  expandWithJobEnv: "true"
-                  expand: "true"
-
-            - name: Docker meta
-              id: meta
-              uses: docker/metadata-action@v4
-              with:
-                  images: |
-                      datarhei/base
-                  tags: |
-                      type=raw,value=${{ env.OS_NAME }}-core-dev,enable=${{ matrix.branch == 'dev' }}
-                      type=raw,value=core-dev-${{ env.OS_NAME }}${{ env.OS_VERSION }},enable=${{ matrix.branch == 'dev' }}
-
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@master
-              with:
-                  platforms: all
-
-            - name: Set up Docker Buildx
-              id: buildx
-              uses: docker/setup-buildx-action@master
-
-            - name: Cache Docker layers
-              uses: actions/cache@v2
-              with:
-                  path: /tmp/.buildx-cache
-                  key: ${{ runner.os }}-buildx-${{ github.sha }}
-                  restore-keys: |
-                      ${{ runner.os }}-buildx-
-
-            - name: Login to DockerHub
-              if: github.event_name != 'pull_request'
-              uses: docker/login-action@v1
-              with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
-
-            - name: Build Multi-Arch
-              uses: docker/build-push-action@v2
-              with:
-                  builder: ${{ steps.buildx.outputs.name }}
-                  context: .
-                  file: ./Dockerfile
-                  build-args: |
-                      BUILD_IMAGE=${{ env.OS_NAME }}:${{ env.OS_VERSION }}
-                      GOLANG_IMAGE=${{ env.GOLANG_IMAGE }}
-                  platforms: linux/amd64,linux/arm64,linux/arm/v7
-                  push: true
-                  tags: ${{ steps.meta.outputs.tags }}
-                  labels: ${{ steps.meta.outputs.labels }}
-                  cache-from: type=local,src=/tmp/.buildx-cache
-                  cache-to: type=local,dest=/tmp/.buildx-cache-new
-    dockerBundle:
-        uses: ./.github/workflows/build_bundle_dev.yaml
-        secrets: inherit
-    dockerBundleRpi:
-        uses: ./.github/workflows/build_bundle-rpi_dev.yaml
-        secrets: inherit
diff --git a/.github/workflows/build_bundle-rpi_dev.yaml b/.github/workflows/build_bundle-rpi_dev.yaml
deleted file mode 100644
index b6618eb7..00000000
--- a/.github/workflows/build_bundle-rpi_dev.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: "Build datarhei/core:rpi-dev bundle"
-
-on:
-    workflow_dispatch:
-    workflow_call:
-    push:
-        branches-ignore:
-            - "**"
-
-jobs:
-    docker:
-        runs-on: [self-hosted]
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - uses: cardinalby/export-env-action@v1
-              with:
-                  envFile: ".github_build/Build.alpine.env"
-                  export: "true"
-                  expandWithJobEnv: "true"
-                  expand: "true"
-
-            - uses: cardinalby/export-env-action@v1
-              with:
-                  envFile: ".github_build/Build.bundle.rpi.dev.env"
-                  export: "true"
-                  expandWithJobEnv: "true"
-                  expand: "true"
-
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@master
-              with:
-                  platforms: all
-
-            - name: Set up Docker Buildx
-              id: buildx
-              uses: docker/setup-buildx-action@master
-
-            - name: Cache Docker layers
-              uses: actions/cache@v2
-              with:
-                  path: /tmp/.buildx-cache
-                  key: ${{ runner.os }}-buildx-${{ github.sha }}
-                  restore-keys: |
-                      ${{ runner.os }}-buildx-
-
-            - name: Login to DockerHub
-              if: github.event_name != 'pull_request'
-              uses: docker/login-action@v1
-              with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
-
-            - name: Build Multi-Arch
-              uses: docker/build-push-action@v2
-              with:
-                  builder: ${{ steps.buildx.outputs.name }}
-                  context: .
-                  file: ./Dockerfile.bundle
-                  build-args: |
-                      CORE_IMAGE=datarhei/base:core-dev-${{ env.OS_NAME }}${{ env.OS_VERSION }}
-                      FFMPEG_IMAGE=datarhei/base:ffmpeg${{ env.FFMPEG_VERSION }}-rpi-${{ env.OS_NAME }}${{ env.OS_VERSION }}
-                  platforms: linux/arm64,linux/arm/v7
-                  push: true
-                  tags: |
-                      datarhei/core:rpi-dev
-                      datarhei/core:rpi-dev-ffmpeg${{ env.FFMPEG_VERSION }}-${{ env.OS_NAME }}${{ env.OS_VERSION }}
-                  cache-from: type=local,src=/tmp/.buildx-cache
-                  cache-to: type=local,dest=/tmp/.buildx-cache-new
diff --git a/.github/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml
deleted file mode 100644
index dc788810..00000000
--- a/.github/workflows/build_bundle_dev.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: "Build datarhei/core:dev bundle"
-
-on:
-    workflow_dispatch:
-    workflow_call:
-    push:
-        branches-ignore:
-            - "**"
-
-jobs:
-    docker:
-        runs-on: [self-hosted]
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - uses: cardinalby/export-env-action@v1
-              with:
-                  envFile: ".github_build/Build.alpine.env"
-                  export: "true"
-                  expandWithJobEnv: "true"
-                  expand: "true"
-
-            - uses: cardinalby/export-env-action@v1
-              with:
-                  envFile: ".github_build/Build.bundle.dev.env"
-                  export: "true"
-                  expandWithJobEnv: "true"
-                  expand: "true"
-
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@master
-              with:
-                  platforms: all
-
-            - name: Set up Docker Buildx
-              id: buildx
-              uses: docker/setup-buildx-action@master
-
-            - name: Cache Docker layers
-              uses: actions/cache@v2
-              with:
-                  path: /tmp/.buildx-cache
-                  key: ${{ runner.os }}-buildx-${{ github.sha }}
-                  restore-keys: |
-                      ${{ runner.os }}-buildx-
-
-            - name: Login to DockerHub
-              if: github.event_name != 'pull_request'
-              uses: docker/login-action@v1
-              with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
-
-            - name: Build Multi-Arch
-              uses: docker/build-push-action@v2
-              with:
-                  builder: ${{ steps.buildx.outputs.name }}
-                  context: .
-                  file: ./Dockerfile.bundle
-                  build-args: |
-                      CORE_IMAGE=datarhei/base:core-dev-${{ env.OS_NAME }}${{ env.OS_VERSION }}
-                      FFMPEG_IMAGE=datarhei/base:ffmpeg${{ env.FFMPEG_VERSION }}-${{ env.OS_NAME }}${{ env.OS_VERSION }}
-                  platforms: linux/amd64,linux/arm64,linux/arm/v7
-                  push: true
-                  tags: |
-                      datarhei/core:dev
-                      datarhei/core:dev-ffmpeg${{ env.FFMPEG_VERSION }}-${{ env.OS_NAME }}${{ env.OS_VERSION }}
-                  cache-from: type=local,src=/tmp/.buildx-cache
-                  cache-to: type=local,dest=/tmp/.buildx-cache-new
diff --git a/.github_build/Build.bundle.dev.env b/.github_build/Build.bundle.dev.env
deleted file mode 100644
index fb5499d0..00000000
--- a/.github_build/Build.bundle.dev.env
+++ /dev/null
@@ -1,2 +0,0 @@
-# CORE DEV BUNDLE
-FFMPEG_VERSION=6.1.1
diff --git a/.github_build/Build.bundle.rpi.dev.env b/.github_build/Build.bundle.rpi.dev.env
deleted file mode 100644
index dd64c2f3..00000000
--- a/.github_build/Build.bundle.rpi.dev.env
+++ /dev/null
@@ -1,2 +0,0 @@
-# CORE RASPBERRY-PI DEV BUNDLE
-FFMPEG_VERSION=6.1.1