diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 03dd8c9..b0b2f80 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -42,12 +42,6 @@ jobs:
           fi
           echo "libwaku artifacts verified successfully"
 
-      - name: Set environment variables for libwaku
-        run: |
-          export LMN_DIR=${{ github.workspace }}/vendor/logos-messaging-nim
-          export CGO_CFLAGS="-I${LMN_DIR}/library"
-          export CGO_LDFLAGS="-L${LMN_DIR}/build -lwaku -Wl,-rpath,${LMN_DIR}/build"
-
       - name: Install Go dependencies
         run: |
           go mod download
@@ -55,6 +49,13 @@ jobs:
 
       - name: Build waku bindings
         run: |
+          export LMN_DIR=${{ github.workspace }}/vendor/logos-messaging-nim
+          export CGO_CFLAGS="-I${LMN_DIR}/library"
+          export CGO_LDFLAGS="-L${LMN_DIR}/build -lwaku -Wl,-rpath,${LMN_DIR}/build"
+          echo "Verifying environment variables:"
+          echo "LMN_DIR=${LMN_DIR}"
+          echo "CGO_CFLAGS=${CGO_CFLAGS}"
+          echo "CGO_LDFLAGS=${CGO_LDFLAGS}"
           make -C waku build
 
       - name: Increase ulimit
diff --git a/waku/Makefile b/waku/Makefile
index 965f308..7bd3a9b 100644
--- a/waku/Makefile
+++ b/waku/Makefile
@@ -44,21 +44,7 @@ check-folders:
 		echo "ERROR: No libwaku library file found in: $(LIBWAKU_LIB_PATH)"; exit 1; \
 	fi
 
-build-libwaku:
-	@echo "Checking/Building libwaku ..."
-	@if [ -f "$(HEADER_FILE)" ] && [ -n "$(LIB_FILES)" ]; then \
-		 echo "libwaku artifacts found, skipping build"; \
-	else \
-		 if [ ! -d "$(LMN_DIR)" ]; then \
-		   echo "No nwaku sources at $(LMN_DIR); cloning shallow copy"; \
-		   mkdir -p $(dir $(LMN_DIR)); \
-		   git clone --depth 1 https://github.com/logos-messaging/logos-messaging-nim.git $(LMN_DIR); \
-		 fi; \
-		 echo "Compiling libwaku ..."; \
-		 $(MAKE) -C $(LMN_DIR) libwaku; \
-	fi
-
-build: build-libwaku check-folders
+build: check-folders
 	@echo "Building Waku Go Bindings (manual)..."
 	go build .
 
@@ -70,19 +56,6 @@ test: build
 		go test . -count=1 -run $(TEST) -v; \
 	fi
 
-build-auto: build-libwaku check-folders
-	@echo "Building Waku Go Bindings (auto)..."
-	go build ./
-
-test-auto: build-auto
-	@echo "Running tests (auto)..."
-	@if [ -z "$(TEST)" ]; then \
-		go test ./...; \
-	else \
-		go test ./ -count=1 -run $(TEST) -v; \
-	fi
-
-
 # Clean up generated files
 clean:
 	@echo "Cleaning up..."