diff --git a/Dockerfile.windows b/Dockerfile.windows
index d793d3850e..c235fac031 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -100,7 +100,79 @@ COPY submodules/fluent-bit /work/submodules/fluent-bit
 
 WORKDIR /work/submodules/fluent-bit/build
 
-RUN cmake -G "'Visual Studio 16 2019'" -DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DFLB_OUT_KINESIS_STREAMS=OFF ../;
+RUN cmake -G "'Visual Studio 16 2019'" -DCMAKE_BUILD_TYPE=RELWITHDEBINFO `
+    -DFLB_WINDOWS_DEFAULTS=Off `
+    -DFLB_REGEX=On `
+    -DFLB_BACKTRACE=Off `
+    -DFLB_CONFIG_YAML=Off `
+    -DFLB_LUAJIT=On `
+    -DFLB_EXAMPLES=On `
+    -DFLB_PARSER=On `
+    -DFLB_TLS=On `
+    -DFLB_HTTP_SERVER=On `
+    -DFLB_METRICS=On `
+    -DFLB_WASM=Off `
+    -DFLB_WAMRC=Off `
+    -DFLB_IN_CPU=Off `
+    -DFLB_IN_DISK=Off `
+    -DFLB_IN_EXEC=On `
+    -DFLB_IN_EXEC_WASI=Off `
+    -DFLB_IN_FORWARD=On `
+    -DFLB_IN_HEALTH=Off `
+    -DFLB_IN_HTTP=On `
+    -DFLB_IN_MEM=Off `
+    -DFLB_IN_KAFKA=Off `
+    -DFLB_IN_KMSG=Off `
+    -DFLB_IN_LIB=On `
+    -DFLB_IN_RANDOM=On `
+    -DFLB_IN_SERIAL=Off `
+    -DFLB_IN_STDIN=Off `
+    -DFLB_IN_SYSLOG=On `
+    -DFLB_IN_TAIL=On `
+    -DFLB_IN_TCP=On `
+    -DFLB_IN_MQTT=Off `
+    -DFLB_IN_HEAD=Off `
+    -DFLB_IN_PROC=Off `
+    -DFLB_IN_SYSTEMD=Off `
+    -DFLB_IN_DUMMY=On `
+    -DFLB_IN_NETIF=Off `
+    -DFLB_IN_WINLOG=On `
+    -DFLB_IN_WINSTAT=On `
+    -DFLB_IN_WINEVTLOG=On `
+    -DFLB_IN_COLLECTD=Off `
+    -DFLB_IN_STATSD=On `
+    -DFLB_IN_STORAGE_BACKLOG=On `
+    -DFLB_IN_EMITTER=On `
+    -DFLB_IN_PODMAN_METRICS=Off `
+    -DFLB_OUT_BIGQUERY=Off `
+    -DFLB_OUT_COUNTER=On `
+    -DFLB_OUT_EXIT=Off `
+    -DFLB_OUT_FORWARD=On `
+    -DFLB_OUT_GELF=On `
+    -DFLB_OUT_HTTP=On `
+    -DFLB_OUT_NATS=Off `
+    -DFLB_OUT_PLOT=Off `
+    -DFLB_OUT_FILE=On `
+    -DFLB_OUT_TD=Off `
+    -DFLB_OUT_RETRY=Off `
+    -DFLB_OUT_STACKDRIVER=On `
+    -DFLB_OUT_STDOUT=On `
+    -DFLB_OUT_LIB=On `
+    -DFLB_OUT_NULL=On `
+    -DFLB_OUT_FLOWCOUNTER=On `
+    -DFLB_OUT_KAFKA=Off `
+    -DFLB_OUT_KAFKA_REST=Off `
+    -DFLB_FILTER_GREP=On `
+    -DFLB_FILTER_MODIFY=On `
+    -DFLB_FILTER_STDOUT=On `
+    -DFLB_FILTER_PARSER=On `
+    -DFLB_FILTER_THROTTLE=On `
+    -DFLB_FILTER_THROTTLE_SIZE=On `
+    -DFLB_FILTER_NEST=On `
+    -DFLB_FILTER_LUA=On `
+    -DFLB_FILTER_RECORD_MODIFIER=On `
+    -DFLB_FILTER_REWRITE_TAG=On `
+    -DFLB_FILTER_WASM=Off ../;
 
 RUN cmake --build . --config Release; `
     Copy-Item -Path bin/Release/fluent-bit.exe -Destination /work/out/bin/; `
@@ -136,7 +208,7 @@ WORKDIR /work/submodules/opentelemetry-operations-collector
 RUN $JarHash = (Get-FileHash /work/out/bin/opentelemetry-java-contrib-jmx-metrics.jar -Algorithm SHA256 | Select -Expand Hash).toLower(); `
     go build -o bin/google-cloud-metrics-agent_windows_amd64.exe `
     -ldflags \"-X github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver.MetricsGathererHash=$JarHash\" `
-     ./cmd/otelopscol; `
+    ./cmd/otelopscol; `
     Copy-Item -Path bin/google-cloud-metrics-agent_windows_amd64.exe -Destination /work/out/bin/;
 
 ###############################################################################
@@ -153,7 +225,7 @@ RUN Get-Content VERSION | Where-Object length | ForEach-Object { Invoke-Expressi
     go build -o bin/google-cloud-ops-agent.exe -ldflags \"-X github.com/GoogleCloudPlatform/ops-agent/internal/version.BuildDistro=$env:BUILD_DISTRO -X github.com/GoogleCloudPlatform/ops-agent/internal/version.Version=$env:PKG_VERSION\" ./cmd/ops_agent_windows; `
     Copy-Item -Path bin/google-cloud-ops-agent.exe -Destination /work/out/bin/; `
     Copy-Item -Path confgenerator/default-config.yaml -Destination /work/out/config/config.yaml;
- 
+
 ###############################################################################
 # Build diagnostic service
 ###############################################################################
diff --git a/submodules/fluent-bit b/submodules/fluent-bit
index 7de2c45227..bda73d8850 160000
--- a/submodules/fluent-bit
+++ b/submodules/fluent-bit
@@ -1 +1 @@
-Subproject commit 7de2c45227468b51d6337141efbe2827dc48ea5f
+Subproject commit bda73d88500166a2b8cce95aa0bad9316a9639b9