diff --git a/.github/workflows/build_bundle-rpi.yaml b/.github/workflows/build_bundle-rpi.yaml
index 420b7eac..2f340d92 100644
--- a/.github/workflows/build_bundle-rpi.yaml
+++ b/.github/workflows/build_bundle-rpi.yaml
@@ -61,7 +61,7 @@ jobs:
                   file: ./Dockerfile.bundle
                   build-args: |
                       CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-${{ env.OS_VERSION }}-${{ env.CORE_VERSION }}
-                      FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
+                      FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
                   platforms: linux/arm/v7,linux/arm64
                   push: true
                   tags: |
diff --git a/.github/workflows/build_bundle-rpi_dev.yaml b/.github/workflows/build_bundle-rpi_dev.yaml
index 3139d622..e26f44f7 100644
--- a/.github/workflows/build_bundle-rpi_dev.yaml
+++ b/.github/workflows/build_bundle-rpi_dev.yaml
@@ -60,7 +60,7 @@ jobs:
           file: ./Dockerfile.bundle
           build-args: |
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
-            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
+            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
           platforms: linux/arm64,linux/arm/v7
           push: true
           tags: |
diff --git a/.github/workflows/build_bundle.yaml b/.github/workflows/build_bundle.yaml
index e2e810fb..69292c3f 100644
--- a/.github/workflows/build_bundle.yaml
+++ b/.github/workflows/build_bundle.yaml
@@ -61,7 +61,7 @@ jobs:
           file: ./Dockerfile.bundle
           build-args: |
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-${{ env.OS_VERSION }}-${{ env.CORE_VERSION }}
-            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
+            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |
diff --git a/.github/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml
index 26e2bf46..b8463f6a 100644
--- a/.github/workflows/build_bundle_dev.yaml
+++ b/.github/workflows/build_bundle_dev.yaml
@@ -60,7 +60,7 @@ jobs:
           file: ./Dockerfile.bundle
           build-args: |
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
-            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
+            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |
diff --git a/.github_build/Build.alpine.env b/.github_build/Build.alpine.env
index 682475ed..66e888c9 100644
--- a/.github_build/Build.alpine.env
+++ b/.github_build/Build.alpine.env
@@ -1,5 +1,6 @@
 # CORE ALPINE BASE IMAGE
 OS_NAME=alpine
-OS_VERSION=3.16
-GOLANG_IMAGE=golang:1.20-alpine3.16
-CORE_VERSION=16.13.1
+OS_VERSION=3.19
+OS_VERSION_FFMPEG=3.16
+GOLANG_IMAGE=golang:1.21-alpine3.19
+CORE_VERSION=16.14.0
diff --git a/.github_build/Build.ubuntu.env b/.github_build/Build.ubuntu.env
index eaeccbf5..df5d5738 100644
--- a/.github_build/Build.ubuntu.env
+++ b/.github_build/Build.ubuntu.env
@@ -1,5 +1,5 @@
 # CORE UBUNTU BASE IMAGE
 OS_NAME=ubuntu
 OS_VERSION=20.04
-GOLANG_IMAGE=golang:1.20-alpine3.16
-CORE_VERSION=16.13.1
+GOLANG_IMAGE=golang:1.21-alpine3.19
+CORE_VERSION=16.14.0