diff --git a/.build-tools/cmd/cmd-bundle-component-metadata.go b/.build-tools/cmd/cmd-bundle-component-metadata.go
index a409f021d..8bc115332 100644
--- a/.build-tools/cmd/cmd-bundle-component-metadata.go
+++ b/.build-tools/cmd/cmd-bundle-component-metadata.go
@@ -64,6 +64,7 @@ var bundleComponentMetadataCmd = &cobra.Command{
 				fmt.Fprintln(os.Stderr, "Info: metadata file not found in component "+component)
 				continue
 			}
+			fmt.Fprintln(os.Stderr, "Info: metadata file loaded for component "+component)
 			bundle.Components = append(bundle.Components, componentMetadata)
 		}
 
diff --git a/.build-tools/component-folders.yaml b/.build-tools/component-folders.yaml
index 6b07dae04..437e8f622 100644
--- a/.build-tools/component-folders.yaml
+++ b/.build-tools/component-folders.yaml
@@ -14,15 +14,21 @@ excludeFolders:
   - bindings/alicloud
   - bindings/aws
   - bindings/azure
+  - bindings/cloudflare
   - bindings/gcp
+  - bindings/http/testdata
   - bindings/huawei
   - bindings/rethinkdb
   - bindings/twilio
+  - bindings/wasm/testdata
   - bindings/zeebe
   - configuration/azure
   - configuration/redis/internal
   - crypto/azure
   - crypto/kubernetes
+  - middleware/http/oauth2clientcredentials/mocks
+  - middleware/http/wasm/example
+  - middleware/http/wasm/internal
   - pubsub/aws
   - pubsub/azure
   - pubsub/azure/servicebus
@@ -34,11 +40,15 @@ excludeFolders:
   - secretstores/hashicorp
   - secretstores/huaweicloud
   - secretstores/local
+  - secretstores/tencentcloud
   - state/alicloud
   - state/aws
   - state/azure
+  - state/azure/blobstorage/internal
+  - state/cloudflare
   - state/gcp
   - state/hashicorp
   - state/oci
   - state/postgresql
+  - state/query
   - state/utils