diff --git a/Dockerfile b/Dockerfile
index 033b677..3650bb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 RUN echo "Building for ${TARGETPLATFORM} architecture"
 RUN make ${TARGETPLATFORM}
 
-FROM fluent/fluent-bit:2.2.2
+FROM fluent/fluent-bit:3.0.4
 
 COPY --from=builder /go/src/github.com/newrelic/newrelic-fluent-bit-output/out_newrelic-linux-*.so /fluent-bit/bin/out_newrelic.so
 COPY *.conf /fluent-bit/etc/
diff --git a/Dockerfile.windows b/Dockerfile.windows
index a5fd008..e925fcb 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -1,6 +1,6 @@
 # escape=`
 
-ARG FLUENTBIT_VERSION=2.2.2
+ARG FLUENTBIT_VERSION=3.0.4
 ARG WINDOWS_VERSION=ltsc2019
 
 #################################################
diff --git a/Dockerfile_debug b/Dockerfile_debug
index 7c16b1c..3a9b501 100644
--- a/Dockerfile_debug
+++ b/Dockerfile_debug
@@ -18,7 +18,7 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 RUN echo "Building for ${TARGETPLATFORM} architecture"
 RUN make ${TARGETPLATFORM}
 
-FROM fluent/fluent-bit:2.2.2-debug
+FROM fluent/fluent-bit:3.0.4-debug
 
 COPY --from=builder /go/src/github.com/newrelic/newrelic-fluent-bit-output/out_newrelic-linux-*.so /fluent-bit/bin/out_newrelic.so
 COPY *.conf /fluent-bit/etc/
diff --git a/Dockerfile_firelens b/Dockerfile_firelens
index 57fc0d8..7d7f29f 100644
--- a/Dockerfile_firelens
+++ b/Dockerfile_firelens
@@ -18,8 +18,8 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 RUN echo "Building for ${TARGETPLATFORM} architecture"
 RUN make ${TARGETPLATFORM}
 
-# aws-for-fluent-bit 2.31.8 is based on Fluent Bit 1.9.10: https://github.com/fala-aws/aws-for-fluent-bit/blob/mainline/CHANGELOG.md#2318
-FROM amazon/aws-for-fluent-bit:2.31.8
+# aws-for-fluent-bit 2.32.2.20240516 is based on Fluent Bit 1.9.10: https://github.com/aws/aws-for-fluent-bit/releases/tag/v2.32.2.20240516
+FROM amazon/aws-for-fluent-bit:2.32.2.20240516
 
 COPY --from=builder /go/src/github.com/newrelic/newrelic-fluent-bit-output/out_newrelic-linux-*.so /fluent-bit/bin/out_newrelic.so
 COPY *.conf /fluent-bit/etc/
diff --git a/version.go b/version.go
index 36eb270..76e914c 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package main
 
-const VERSION = "1.19.2"
+const VERSION = "2.0.0"