diff --git a/projects/connectedhomeip/Dockerfile b/projects/connectedhomeip/Dockerfile
index 0c1aa2021fe87..25697000f33a2 100644
--- a/projects/connectedhomeip/Dockerfile
+++ b/projects/connectedhomeip/Dockerfile
@@ -40,7 +40,8 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 RUN rustup install nightly
 RUN rustup default nightly
 
-RUN git clone --depth=1 https://github.com/project-chip/connectedhomeip.git connectedhomeip
+RUN git clone --depth=1 --branch AA/pkgconfig https://github.com/Alami-Amine/connectedhomeip.git connectedhomeip
+
 
 # Ensure global python has access to build requirements
 RUN pip3 install -r connectedhomeip/scripts/setup/requirements.build.txt
diff --git a/projects/connectedhomeip/build.sh b/projects/connectedhomeip/build.sh
index a96cc860cbbbc..b4a4b901e719c 100644
--- a/projects/connectedhomeip/build.sh
+++ b/projects/connectedhomeip/build.sh
@@ -50,7 +50,7 @@ gn gen out/fuzz_targets \
     enable_rtti=true \
     chip_enable_thread_safety_checks=false \
     chip_enable_openthread=false \
-    target_ldflags=[\"-fuse-ld=lld\", \"-Bstatic\", \"-lselinux\", \"-lmount\", \"-lblkid\", \"-lz\", \"-lpcre\", \"-lffi\", \"-lgmodule-2.0\", \"-Wl,-Bdynamic\"]"
+    target_ldflags=[\"-fuse-ld=lld\"]"
 
 # Deactivate Pigweed environment to use OSS-Fuzz toolchains
 deactivate