diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f0fb28d8c..06fe5f9f1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -28,112 +28,112 @@ jobs:
       snapshot_nvidia:
         VERSION: snapshot
         VARIANT: nvidia
-      4_2_1_ubuntu:
+      4_2_ubuntu:
         VERSION: 4.2
         VARIANT: ubuntu
-      4_2_1_alpine:
+      4_2_alpine:
         VERSION: 4.2
         VARIANT: alpine
-      4_2_1_centos:
+      4_2_centos:
         VERSION: 4.2
         VARIANT: centos
-      4_2_1_scratch:
+      4_2_scratch:
         VERSION: 4.2
         VARIANT: scratch
-      4_2_1_vaapi:
+      4_2_vaapi:
         VERSION: 4.2
         VARIANT: vaapi
-      4_2_1_nvidia:
+      4_2_nvidia:
         VERSION: 4.2
         VARIANT: nvidia
-      4_1_4_ubuntu:
+      4_1_ubuntu:
         VERSION: 4.1
         VARIANT: ubuntu
-      4_1_4_alpine:
+      4_1_alpine:
         VERSION: 4.1
         VARIANT: alpine
-      4_1_4_centos:
+      4_1_centos:
         VERSION: 4.1
         VARIANT: centos
-      4_1_4_scratch:
+      4_1_scratch:
         VERSION: 4.1
         VARIANT: scratch
-      4_1_4_vaapi:
+      4_1_vaapi:
         VERSION: 4.1
         VARIANT: vaapi
-      4_1_4_nvidia:
+      4_1_nvidia:
         VERSION: 4.1
         VARIANT: nvidia
-      4_0_5_ubuntu:
+      4_0_ubuntu:
         VERSION: 4.0
         VARIANT: ubuntu
-      4_0_5_alpine:
+      4_0_alpine:
         VERSION: 4.0
         VARIANT: alpine
-      4_0_5_centos:
+      4_0_centos:
         VERSION: 4.0
         VARIANT: centos
-      4_0_5_scratch:
+      4_0_scratch:
         VERSION: 4.0
         VARIANT: scratch
-      4_0_5_vaapi:
+      4_0_vaapi:
         VERSION: 4.0
         VARIANT: vaapi
-      4_0_5_nvidia:
+      4_0_nvidia:
         VERSION: 4.0
         VARIANT: nvidia
-      3_4_6_ubuntu:
+      3_4_ubuntu:
         VERSION: 3.4
         VARIANT: ubuntu
-      3_4_6_alpine:
+      3_4_alpine:
         VERSION: 3.4
         VARIANT: alpine
-      3_4_6_centos:
+      3_4_centos:
         VERSION: 3.4
         VARIANT: centos
-      3_4_6_scratch:
+      3_4_scratch:
         VERSION: 3.4
         VARIANT: scratch
-      3_4_6_vaapi:
+      3_4_vaapi:
         VERSION: 3.4
         VARIANT: vaapi
-      3_4_6_nvidia:
+      3_4_nvidia:
         VERSION: 3.4
         VARIANT: nvidia
-      3_3_9_ubuntu:
+      3_3_ubuntu:
         VERSION: 3.3
         VARIANT: ubuntu
-      3_3_9_alpine:
+      3_3_alpine:
         VERSION: 3.3
         VARIANT: alpine
-      3_3_9_centos:
+      3_3_centos:
         VERSION: 3.3
         VARIANT: centos
-      3_3_9_scratch:
+      3_3_scratch:
         VERSION: 3.3
         VARIANT: scratch
-      3_3_9_vaapi:
+      3_3_vaapi:
         VERSION: 3.3
         VARIANT: vaapi
-      3_3_9_nvidia:
+      3_3_nvidia:
         VERSION: 3.3
         VARIANT: nvidia
-      3_2_14_ubuntu:
+      3_2_ubuntu:
         VERSION: 3.2
         VARIANT: ubuntu
-      3_2_14_alpine:
+      3_2_alpine:
         VERSION: 3.2
         VARIANT: alpine
-      3_2_14_centos:
+      3_2_centos:
         VERSION: 3.2
         VARIANT: centos
-      3_2_14_scratch:
+      3_2_scratch:
         VERSION: 3.2
         VARIANT: scratch
-      3_2_14_vaapi:
+      3_2_vaapi:
         VERSION: 3.2
         VARIANT: vaapi
-      3_2_14_nvidia:
+      3_2_nvidia:
         VERSION: 3.2
         VARIANT: nvidia
   steps:
diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile
index bca711720..a91a51bbf 100644
--- a/docker-images/3.4/alpine/Dockerfile
+++ b/docker-images/3.4/alpine/Dockerfile
@@ -18,7 +18,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=3.4.6 \
+ENV         FFMPEG_VERSION=3.4.7 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile
index 7a9f57b40..9752e23ed 100644
--- a/docker-images/3.4/centos/Dockerfile
+++ b/docker-images/3.4/centos/Dockerfile
@@ -20,7 +20,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=3.4.6 \
+ENV         FFMPEG_VERSION=3.4.7 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/3.4/nvidia/Dockerfile b/docker-images/3.4/nvidia/Dockerfile
index 4400b9ee7..eeaab982e 100644
--- a/docker-images/3.4/nvidia/Dockerfile
+++ b/docker-images/3.4/nvidia/Dockerfile
@@ -35,7 +35,7 @@ ENV        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib"
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j12"
 
-ENV         FFMPEG_VERSION=3.4.6 \
+ENV         FFMPEG_VERSION=3.4.7 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile
index 64f4980fe..8ed7c8923 100644
--- a/docker-images/3.4/scratch/Dockerfile
+++ b/docker-images/3.4/scratch/Dockerfile
@@ -13,7 +13,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=3.4.6 \
+ENV         FFMPEG_VERSION=3.4.7 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile
index 58fe5e2a4..7c357752a 100644
--- a/docker-images/3.4/ubuntu/Dockerfile
+++ b/docker-images/3.4/ubuntu/Dockerfile
@@ -21,7 +21,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=3.4.6 \
+ENV         FFMPEG_VERSION=3.4.7 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/3.4/vaapi/Dockerfile b/docker-images/3.4/vaapi/Dockerfile
index 22db49394..50d97f43f 100644
--- a/docker-images/3.4/vaapi/Dockerfile
+++ b/docker-images/3.4/vaapi/Dockerfile
@@ -21,7 +21,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=3.4.6 \
+ENV         FFMPEG_VERSION=3.4.7 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/4.2/alpine/Dockerfile b/docker-images/4.2/alpine/Dockerfile
index 20c83f837..678a851d4 100644
--- a/docker-images/4.2/alpine/Dockerfile
+++ b/docker-images/4.2/alpine/Dockerfile
@@ -18,7 +18,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=4.2.1 \
+ENV         FFMPEG_VERSION=4.2.2 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/4.2/centos/Dockerfile b/docker-images/4.2/centos/Dockerfile
index 5e80b1ddb..03d2dd10e 100644
--- a/docker-images/4.2/centos/Dockerfile
+++ b/docker-images/4.2/centos/Dockerfile
@@ -20,7 +20,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=4.2.1 \
+ENV         FFMPEG_VERSION=4.2.2 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/4.2/nvidia/Dockerfile b/docker-images/4.2/nvidia/Dockerfile
index ca6fc507a..b75e960bd 100644
--- a/docker-images/4.2/nvidia/Dockerfile
+++ b/docker-images/4.2/nvidia/Dockerfile
@@ -35,7 +35,7 @@ ENV        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib"
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j12"
 
-ENV         FFMPEG_VERSION=4.2.1 \
+ENV         FFMPEG_VERSION=4.2.2 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/4.2/scratch/Dockerfile b/docker-images/4.2/scratch/Dockerfile
index 773e3d32b..974806bd9 100644
--- a/docker-images/4.2/scratch/Dockerfile
+++ b/docker-images/4.2/scratch/Dockerfile
@@ -13,7 +13,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=4.2.1 \
+ENV         FFMPEG_VERSION=4.2.2 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/4.2/ubuntu/Dockerfile b/docker-images/4.2/ubuntu/Dockerfile
index 6dbfdde7d..344099280 100644
--- a/docker-images/4.2/ubuntu/Dockerfile
+++ b/docker-images/4.2/ubuntu/Dockerfile
@@ -21,7 +21,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=4.2.1 \
+ENV         FFMPEG_VERSION=4.2.2 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/4.2/vaapi/Dockerfile b/docker-images/4.2/vaapi/Dockerfile
index 4958bb239..26e3ca7ea 100644
--- a/docker-images/4.2/vaapi/Dockerfile
+++ b/docker-images/4.2/vaapi/Dockerfile
@@ -21,7 +21,7 @@ ARG        LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG        PREFIX=/opt/ffmpeg
 ARG        MAKEFLAGS="-j2"
 
-ENV         FFMPEG_VERSION=4.2.1 \
+ENV         FFMPEG_VERSION=4.2.2 \
             AOM_VERSION=v1.0.0 \
             FDKAAC_VERSION=0.1.5 \
             FONTCONFIG_VERSION=2.12.4 \
diff --git a/docker-images/gitlab-ci.yml b/docker-images/gitlab-ci.yml
index b1de31c37..32989c974 100644
--- a/docker-images/gitlab-ci.yml
+++ b/docker-images/gitlab-ci.yml
@@ -35,37 +35,37 @@ snapshot-nvidia:
     VERSION: "snapshot"
     VARIANT: nvidia
 
-4.2.1-ubuntu:
+4.2.2-ubuntu:
   extends: .docker
   variables:
     VERSION: "4.2"
     VARIANT: ubuntu
 
-4.2.1-alpine:
+4.2.2-alpine:
   extends: .docker
   variables:
     VERSION: "4.2"
     VARIANT: alpine
 
-4.2.1-centos:
+4.2.2-centos:
   extends: .docker
   variables:
     VERSION: "4.2"
     VARIANT: centos
 
-4.2.1-scratch:
+4.2.2-scratch:
   extends: .docker
   variables:
     VERSION: "4.2"
     VARIANT: scratch
 
-4.2.1-vaapi:
+4.2.2-vaapi:
   extends: .docker
   variables:
     VERSION: "4.2"
     VARIANT: vaapi
 
-4.2.1-nvidia:
+4.2.2-nvidia:
   extends: .docker
   variables:
     VERSION: "4.2"
@@ -143,37 +143,37 @@ snapshot-nvidia:
     VERSION: "4.0"
     VARIANT: nvidia
 
-3.4.6-ubuntu:
+3.4.7-ubuntu:
   extends: .docker
   variables:
     VERSION: "3.4"
     VARIANT: ubuntu
 
-3.4.6-alpine:
+3.4.7-alpine:
   extends: .docker
   variables:
     VERSION: "3.4"
     VARIANT: alpine
 
-3.4.6-centos:
+3.4.7-centos:
   extends: .docker
   variables:
     VERSION: "3.4"
     VARIANT: centos
 
-3.4.6-scratch:
+3.4.7-scratch:
   extends: .docker
   variables:
     VERSION: "3.4"
     VARIANT: scratch
 
-3.4.6-vaapi:
+3.4.7-vaapi:
   extends: .docker
   variables:
     VERSION: "3.4"
     VARIANT: vaapi
 
-3.4.6-nvidia:
+3.4.7-nvidia:
   extends: .docker
   variables:
     VERSION: "3.4"
diff --git a/update.py b/update.py
index d9e84d94a..f5f7a4007 100755
--- a/update.py
+++ b/update.py
@@ -68,7 +68,7 @@
 
         azure.append(
             "      %s_%s:\n        VERSION: %s\n        VARIANT: %s"
-            % (version.replace(".", "_"), variant, short_version, variant)
+            % (short_version.replace(".", "_"), variant, short_version, variant)
         )
 
         with open("templates/Dockerfile-env", "r") as tmpfile: