diff --git a/.ffmpeg/Dockerfile b/.ffmpeg/Dockerfile
index b59969f0f0..3a5517c56a 100644
--- a/.ffmpeg/Dockerfile
+++ b/.ffmpeg/Dockerfile
@@ -5,6 +5,8 @@ ARG GO_VERSION="latest"
 ARG GO_CRYPTO_VERSION="v0.35.0"
 ARG GO_OAUTH2_VERSION="v0.27.0"
 ARG GO_NET_VERSION="v0.36.0"
+ARG GOLANG_JWT_V4_VERSION="v4.5.2"
+ARG GOLANG_JWT_V5_VERSION="v5.2.2"
 
 USER root
 
@@ -38,6 +40,8 @@ RUN cd /usr/local/src \
     && sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
     && sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
     && sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
+    && sed -i "s|github.com/golang-jwt/jwt/v5 v.*|github.com/golang-jwt/jwt/v5 v5.2.2|g" go.mod \
+    && sed -i "s|github.com/golang-jwt/jwt/v4 v.*|github.com/golang-jwt/jwt/v4 v4.5.2|g" go.mod \
     && go mod tidy \
     # Build rclone
     && make \
diff --git a/Makefile b/Makefile
index d5d9b8b20f..30c434963f 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,9 @@ BUILD_ARGS := $(BUILD_ARGS) --progress plain
 MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION)))
 MINOR := $(word 2,$(subst ., ,$(TAG_VERSION)))
 MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(TAG_VERSION)))
-FFMPEG_VERSION := $(or $(FFMPEG_VERSION),$(FFMPEG_VERSION),7.1.1)
+FFMPEG_VERSION := $(or $(FFMPEG_VERSION),$(FFMPEG_VERSION),7.1)
 FFMPEG_TAG_PREV_VERSION := $(or $(FFMPEG_TAG_PREV_VERSION),$(FFMPEG_TAG_PREV_VERSION),ffmpeg-7.1.1.1)
-FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.1.1.1.1)
+FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.1)
 FFMPEG_BASED_NAME := $(or $(FFMPEG_BASED_NAME),$(FFMPEG_BASED_NAME),selenium)
 FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),latest)
 CURRENT_PLATFORM := $(shell if [ `arch` = "aarch64" ] || [ `arch` = "arm64" ]; then echo "linux/arm64"; else echo "linux/amd64"; fi)