diff --git a/.github/workflows/build_bundle-cuda_dev.yaml b/.github/workflows/build_bundle-cuda_dev.yaml
index 47b1e22..1635265 100644
--- a/.github/workflows/build_bundle-cuda_dev.yaml
+++ b/.github/workflows/build_bundle-cuda_dev.yaml
@@ -52,7 +52,7 @@ jobs:
           file: ./Dockerfile
           build-args: |
             RESTREAMER_UI_IMAGE=datarhei/restreamer-ui:dev
-            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-cuda-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}-${{ env.CUDA_VERSION }}
+            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-cuda-latest
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
           platforms: linux/amd64
           push: true
diff --git a/.github/workflows/build_bundle-rpi_dev.yaml b/.github/workflows/build_bundle-rpi_dev.yaml
index c7fcdd4..2bb4e01 100644
--- a/.github/workflows/build_bundle-rpi_dev.yaml
+++ b/.github/workflows/build_bundle-rpi_dev.yaml
@@ -52,7 +52,7 @@ jobs:
           file: ./Dockerfile
           build-args: |
             RESTREAMER_UI_IMAGE=datarhei/restreamer-ui: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-latest
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
           platforms: linux/arm64,linux/arm/v7
           push: true
diff --git a/.github/workflows/build_bundle-vaapi_dev.yaml b/.github/workflows/build_bundle-vaapi_dev.yaml
index a52b65d..49a537f 100644
--- a/.github/workflows/build_bundle-vaapi_dev.yaml
+++ b/.github/workflows/build_bundle-vaapi_dev.yaml
@@ -52,7 +52,7 @@ jobs:
           file: ./Dockerfile
           build-args: |
             RESTREAMER_UI_IMAGE=datarhei/restreamer-ui:dev
-            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-vaapi-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
+            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-vaapi-latest
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
           platforms: linux/amd64
           push: true
diff --git a/.github/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml
index 8be56fb..220fea7 100644
--- a/.github/workflows/build_bundle_dev.yaml
+++ b/.github/workflows/build_bundle_dev.yaml
@@ -53,7 +53,7 @@ jobs:
           build-args: |
             RESTREAMER_UI_IMAGE=datarhei/restreamer-ui:dev
             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-latest
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |