diff --git a/Dockerfile b/Dockerfile
index 829c9ef9..a508c8ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -137,7 +137,7 @@ ARG MESA_VERSION="<unknown>"
 ARG PULSEAUDIO_COMMIT="<unknown>"
 ARG WESTON_COMMIT="<unknown>"
 ARG SYSTEMDISTRO_DEBUG_BUILD
-ARG FREERDP_VERSION=2
+ARG FREERDP_VERSION=3
 
 # Fail fast if any required --build-arg is missing or still holds a
 # placeholder value. We have to validate up-front because the values
@@ -265,9 +265,13 @@ RUN cmake -G Ninja \
         -DCMAKE_BUILD_TYPE=${BUILDTYPE_FREERDP} \
         -DWITH_DEBUG_ALL=${WITH_DEBUG_FREERDP} \
         -DWITH_ICU=ON \
+        -DWITH_FFMPEG=OFF \
+        -DWITH_DSP_FFMPEG=OFF \
+        -DWITH_VIDEO_FFMPEG=OFF \
+        -DWITH_SWSCALE=OFF \
+        -DWITH_KRB5=OFF \
         -DWITH_SERVER=ON \
-        -DWITH_CHANNEL_GFXREDIR=ON \
-        -DWITH_CHANNEL_RDPAPPLIST=ON \
+        -DCHANNEL_GFXREDIR=ON \
         -DWITH_CLIENT=OFF \
         -DWITH_CLIENT_COMMON=OFF \
         -DWITH_CLIENT_CHANNELS=OFF \
diff --git a/WSLGd/main.cpp b/WSLGd/main.cpp
index accd8313..813162e7 100644
--- a/WSLGd/main.cpp
+++ b/WSLGd/main.cpp
@@ -165,9 +165,13 @@ void SetupOptionalEnv()
     wIniFile* wslgConfigIniFile = IniFile_New();
     if (wslgConfigIniFile) {
         if (IniFile_ReadFile(wslgConfigIniFile, configFilePath.c_str()) > 0) {
+#if WINPR_VERSION_MAJOR >= 3
+            size_t numKeys = 0;
+#else
             int numKeys = 0;
+#endif
             char **keyNames = IniFile_GetSectionKeyNames(wslgConfigIniFile, c_systemDistroEnvSection, &numKeys);
-            for (int n = 0; keyNames && n < numKeys; n++) {
+            for (decltype(numKeys) n = 0; keyNames && n < numKeys; n++) {
                 const char *value = IniFile_GetKeyValueString(wslgConfigIniFile, c_systemDistroEnvSection, keyNames[n]);
                 if (value) {
                     setenv(keyNames[n], value, true);
diff --git a/WSLGd/precomp.h b/WSLGd/precomp.h
index f18fc37b..442df012 100644
--- a/WSLGd/precomp.h
+++ b/WSLGd/precomp.h
@@ -35,5 +35,6 @@
 #include "config.h"
 #include "lxwil.h"
 #if HAVE_WINPR
+#include "winpr/version.h"
 #include "winpr/ini.h"
 #endif // HAVE_WINPR
diff --git a/cgmanifest.json b/cgmanifest.json
index 04d5b651..031a9e9d 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -25,7 +25,7 @@
                 "Type": "git", 
                 "Git": {
                     "RepositoryUrl": "https://github.com/FreeRDP/FreeRDP", 
-                    "CommitHash": "39f56443f2dc50e0dcfa52d4f8f15008d5b8ed8e"
+                    "CommitHash": "3f6d7cb1f8973cc84c66b258a9a61c4e2b2f30a6"
                 }
             },
             "DevelopmentDependency": false