diff --git a/Makefile b/Makefile
index 0baa56ae..888d061f 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,7 @@ docker_test_lint:
 .PHONY: docker_generate_docs
 docker_generate_docs:
 	docker run --rm -it \
+		-e ENABLE_BPMETADATA \
 		-v "${CURDIR}":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'
diff --git a/metadata.yaml b/metadata.yaml
index 56c26ed3..8a2e210d 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -361,7 +361,6 @@ spec:
           - roles/resourcemanager.tagUser
       - level: Project
         roles:
-          - roles/owner
           - roles/resourcemanager.projectCreator
           - roles/resourcemanager.folderAdmin
           - roles/resourcemanager.folderIamAdmin
@@ -369,7 +368,6 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/owner
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
diff --git a/modules/budget/metadata.yaml b/modules/budget/metadata.yaml
index 14943ce4..dfe066c0 100644
--- a/modules/budget/metadata.yaml
+++ b/modules/budget/metadata.yaml
@@ -127,7 +127,6 @@ spec:
           - roles/resourcemanager.tagUser
       - level: Project
         roles:
-          - roles/owner
           - roles/resourcemanager.projectCreator
           - roles/resourcemanager.folderAdmin
           - roles/resourcemanager.folderIamAdmin
@@ -135,7 +134,6 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/owner
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
diff --git a/modules/essential_contacts/metadata.yaml b/modules/essential_contacts/metadata.yaml
index 90cc3c09..2179fc3b 100644
--- a/modules/essential_contacts/metadata.yaml
+++ b/modules/essential_contacts/metadata.yaml
@@ -84,7 +84,6 @@ spec:
           - roles/resourcemanager.tagUser
       - level: Project
         roles:
-          - roles/owner
           - roles/resourcemanager.projectCreator
           - roles/resourcemanager.folderAdmin
           - roles/resourcemanager.folderIamAdmin
@@ -92,7 +91,6 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/owner
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
diff --git a/modules/fabric-project/metadata.yaml b/modules/fabric-project/metadata.yaml
index e8c161bf..3ed1317f 100644
--- a/modules/fabric-project/metadata.yaml
+++ b/modules/fabric-project/metadata.yaml
@@ -158,7 +158,6 @@ spec:
           - roles/resourcemanager.tagUser
       - level: Project
         roles:
-          - roles/owner
           - roles/resourcemanager.projectCreator
           - roles/resourcemanager.folderAdmin
           - roles/resourcemanager.folderIamAdmin
@@ -166,7 +165,6 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/owner
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
diff --git a/modules/gsuite_enabled/metadata.yaml b/modules/gsuite_enabled/metadata.yaml
index 3ad3eacb..f8deb8b7 100644
--- a/modules/gsuite_enabled/metadata.yaml
+++ b/modules/gsuite_enabled/metadata.yaml
@@ -255,7 +255,6 @@ spec:
           - roles/resourcemanager.tagUser
       - level: Project
         roles:
-          - roles/owner
           - roles/resourcemanager.projectCreator
           - roles/resourcemanager.folderAdmin
           - roles/resourcemanager.folderIamAdmin
@@ -263,7 +262,6 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/owner
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
diff --git a/modules/project_services/metadata.yaml b/modules/project_services/metadata.yaml
index 002bc24f..e1210a4f 100644
--- a/modules/project_services/metadata.yaml
+++ b/modules/project_services/metadata.yaml
@@ -109,7 +109,6 @@ spec:
           - roles/resourcemanager.tagUser
       - level: Project
         roles:
-          - roles/owner
           - roles/resourcemanager.projectCreator
           - roles/resourcemanager.folderAdmin
           - roles/resourcemanager.folderIamAdmin
@@ -117,7 +116,6 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/owner
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
diff --git a/modules/quota_manager/metadata.yaml b/modules/quota_manager/metadata.yaml
index 95ef8c1c..9dcdfdee 100644
--- a/modules/quota_manager/metadata.yaml
+++ b/modules/quota_manager/metadata.yaml
@@ -84,7 +84,6 @@ spec:
           - roles/resourcemanager.tagUser
       - level: Project
         roles:
-          - roles/owner
           - roles/resourcemanager.projectCreator
           - roles/resourcemanager.folderAdmin
           - roles/resourcemanager.folderIamAdmin
@@ -92,7 +91,6 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/owner
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
diff --git a/modules/shared_vpc_access/metadata.yaml b/modules/shared_vpc_access/metadata.yaml
index c985bd57..1d7f58b6 100644
--- a/modules/shared_vpc_access/metadata.yaml
+++ b/modules/shared_vpc_access/metadata.yaml
@@ -111,7 +111,6 @@ spec:
           - roles/resourcemanager.tagUser
       - level: Project
         roles:
-          - roles/owner
           - roles/resourcemanager.projectCreator
           - roles/resourcemanager.folderAdmin
           - roles/resourcemanager.folderIamAdmin
@@ -119,7 +118,6 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/owner
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
diff --git a/modules/svpc_service_project/metadata.yaml b/modules/svpc_service_project/metadata.yaml
index a1ce9947..c555d501 100644
--- a/modules/svpc_service_project/metadata.yaml
+++ b/modules/svpc_service_project/metadata.yaml
@@ -242,7 +242,6 @@ spec:
           - roles/resourcemanager.tagUser
       - level: Project
         roles:
-          - roles/owner
           - roles/resourcemanager.projectCreator
           - roles/resourcemanager.folderAdmin
           - roles/resourcemanager.folderIamAdmin
@@ -250,7 +249,6 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/owner
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/resourcemanager.projectIamAdmin
diff --git a/test/setup/iam.tf b/test/setup/iam.tf
index 8f1b2acb..eb17a581 100644
--- a/test/setup/iam.tf
+++ b/test/setup/iam.tf
@@ -16,7 +16,6 @@
 
 locals {
   int_required_project_roles = [
-    "roles/owner",
     "roles/compute.admin",
     "roles/iam.serviceAccountAdmin",
     "roles/resourcemanager.projectIamAdmin",
@@ -26,7 +25,6 @@ locals {
   ]
 
   int_required_folder_roles = [
-    "roles/owner",
     "roles/resourcemanager.projectCreator",
     "roles/resourcemanager.folderAdmin",
     "roles/resourcemanager.folderIamAdmin",