diff --git a/CI/flatpak/com.obsproject.Studio.json b/CI/flatpak/com.obsproject.Studio.json
index d7baaeb39..78956322a 100644
--- a/CI/flatpak/com.obsproject.Studio.json
+++ b/CI/flatpak/com.obsproject.Studio.json
@@ -187,8 +187,7 @@
         {
           "type": "git",
           "url": "https://aomedia.googlesource.com/aom.git",
-          "tag": "v3.2.0",
-          "commit": "287164de79516c25c8c84fd544f67752c170082a"
+          "commit": "402e264b94fd74bdf66837da216b6251805b4ae4"
         }
       ]
     },
@@ -211,8 +210,8 @@
         {
           "type": "git",
           "url": "https://gitlab.com/AOMediaCodec/SVT-AV1.git",
-          "tag": "v0.8.6",
-          "commit": "a5ec26c0f0bd6e872a0b2bb340b4a777f4847020"
+          "tag": "v0.9.0",
+          "commit": "fdf4f36867bba068e221965d12c5975c509845da"
         }
       ]
     },
@@ -258,6 +257,10 @@
           "type": "shell",
           "commands": [
             "git cherry-pick -n d1b47f3bfcc625ca1cae210fc198dcbd54381a88 # avcodec/vaapi_encode: Fix segfault upon closing uninitialized encoder",
+            "git cherry-pick -n c5f314309067dc85c165b975f53975c38e196258 # avcodec/libsvtav1: properly enforce CQP mode when set in wrapper",
+            "git cherry-pick -n 0463f5d6d56db6cc01bc88a0d77488f4ef23dfdc # avcodec/libsvtav1: Fix value range for rc mode",
+            "git cherry-pick -n 64e2fb3f9d89e5ad552f48e2d5beb9be7a91572a # avcodec/libsvtav1: make coded GOP type configurable",
+            "git cherry-pick -n 04b89e8ae33ba74e5cb5b3b770613fa599f9cb36 # avcodec/libsvtav1: Fix duplicate definition of caps_internal",
             "patch -Np1 -i obs-deps/CI/patches/FFmpeg-4.4.1-OBS.patch",
             "patch -Np1 -i obs-deps/CI/patches/FFmpeg-4.4.1-librist.patch",
             "patch -Np1 -i obs-deps/CI/patches/FFmpeg-4.4.1-libaomenc.patch",