diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index ac74b443bc..8f4db92cea 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4.1",
-  "port-version": 7,
+  "port-version": 8,
   "description": [
     "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
     "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
@@ -33,14 +33,12 @@
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "ass",
             "avcodec",
             "avdevice",
             "avfilter",
             "avformat",
             "avresample",
             "bzip2",
-            "fontconfig",
             "freetype",
             "iconv",
             "lzma",
@@ -76,6 +74,22 @@
           ],
           "platform": "!osx"
         },
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "ass"
+          ],
+          "platform": "!uwp"
+        },
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "fontconfig"
+          ],
+          "platform": "!uwp"
+        },
         {
           "name": "ffmpeg",
           "default-features": false,
@@ -116,14 +130,6 @@
           ],
           "platform": "!uwp"
         },
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "tensorflow"
-          ],
-          "platform": "!static"
-        },
         {
           "name": "ffmpeg",
           "default-features": false,
@@ -140,6 +146,14 @@
           ],
           "platform": "!(uwp | arm)"
         },
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "tensorflow"
+          ],
+          "platform": "x64 & !static & !uwp"
+        },
         {
           "name": "ffmpeg",
           "default-features": false,
@@ -170,7 +184,7 @@
           "features": [
             "tesseract"
           ],
-          "platform": "!(windows & arm) & !static"
+          "platform": "!(windows & arm) & !static & !uwp"
         }
       ]
     },
diff --git a/versions/baseline.json b/versions/baseline.json
index def47df08e..71226c4131 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2154,7 +2154,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.1",
-      "port-version": 7
+      "port-version": 8
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 9ee299366a..3132380518 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "03b7a2329bc927de9637d45738c23e607e4f4387",
+      "version": "4.4.1",
+      "port-version": 8
+    },
     {
       "git-tree": "8b692478001452049ea19d32ec199f58c5de3a77",
       "version": "4.4.1",