diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent
index a6aeccfe2..9bf9a45f3 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent
@@ -166,8 +166,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     cmake --log-level=ERROR `
         -G 'Visual Studio 16 2019' `
 	-A $env:BUILD_ARCH `
-        -DPCRE_SUPPORT_UNICODE_PROPERTIES=ON `
-        -DPCRE_SUPPORT_UTF=ON `
+	-DBUILD_SHARED_LIBS=OFF `
         -DCMAKE_C_FLAGS_RELEASE:string="""/MT""" ..; `
     msbuild PCRE2.sln `
         -maxcpucount:"""$env:NUMBER_OF_PROCESSORS""" `
diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2
index 7cb1b445e..bc2f567d0 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent2
@@ -189,7 +189,6 @@ RUN Set-Location -Path $env:SystemDrive\.; `
         -DBUILD_SHARED_LIBS=OFF `
         -DCMAKE_C_COMPILER=gcc `
         -DCMAKE_C_FLAGS='-O2 -g' `
-        -DCMAKE_CXX_FLAGS='-O2 -g' `
         -DCMAKE_INSTALL_PREFIX="""$env:SystemDrive\pcre2_output""" . ; `
     mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS"""; `
     mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install; `