diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
index b1d505a1574..175f7f1800e 100644
--- a/dockerfiles/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -28,7 +28,7 @@ ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
 ARG FLB_CHUNK_TRACE=On
 ENV FLB_CHUNK_TRACE=${FLB_CHUNK_TRACE}
 
-RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log
+RUN mkdir -p /fluent-bit/bin /fluent-bit/etc /fluent-bit/log /usr/lib/debug/fluent-bit/bin
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -80,6 +80,9 @@ RUN cmake -DFLB_RELEASE=On \
 
 RUN make -j "$(getconf _NPROCESSORS_ONLN)"
 RUN install bin/fluent-bit /fluent-bit/bin/
+RUN objcopy --only-keep-debug /fluent-bit/bin/fluent-bit /usr/lib/debug/fluent-bit/bin/fluent-bit.debug && \
+    objcopy --strip-debug /fluent-bit/bin/fluent-bit && \
+    objcopy --add-gnu-debuglink=/usr/lib/debug/fluent-bit/bin/fluent-bit.debug /fluent-bit/bin/fluent-bit
 
 # Configuration files
 COPY conf/fluent-bit.conf \
@@ -231,6 +234,7 @@ RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/
 
 RUN rm -f /usr/bin/qemu-*-static
 COPY --from=builder /fluent-bit /fluent-bit
+COPY --from=builder /usr/lib/debug/fluent-bit /usr/lib/debug/fluent-bit
 
 EXPOSE 2020