diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 78039ad0..5ce49f22 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,25 +1,26 @@
 # Overall sample owners
 
-*                       @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/terraform-samples-reviewers
-/*                      @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/terraform-samples-reviewers @terraform-google-modules/cloud-samples-infra
-/.github/               @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cloud-samples-infra
-/test/                  @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cft-admins @terraform-google-modules/cloud-samples-infra
-/build/                 @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cft-admins @terraform-google-modules/cloud-samples-infra
+*                             @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/terraform-samples-reviewers
+/*                            @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/terraform-samples-reviewers @terraform-google-modules/cloud-samples-infra
+/.github/                     @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cloud-samples-infra
+/test/                        @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cft-admins @terraform-google-modules/cloud-samples-infra
+/build/                       @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cft-admins @terraform-google-modules/cloud-samples-infra
 
-/bigquery/              @terraform-google-modules/bigquery-terraform-swe @terraform-google-modules/terraform-samples-reviewers
-/cloud_sql/             @terraform-google-modules/terraform-samples-reviewers
-/cloudvpn/              @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
-/composer/              @terraform-google-modules/cloud-dpes-composer @terraform-google-modules/terraform-samples-reviewers
-/compute/               @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
-/dns/                   @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
-/gke/                   @terraform-google-modules/eks-team @terraform-google-modules/terraform-samples-reviewers
-/lb/                    @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
-/looker/		@terraform-google-modules/cloud-looker-docs @terraform-google-modules/terraform-samples-reviewers
-/media_cdn/             @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
-/network_connectivity/  @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
-/privateca/             @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
-/storage/               @terraform-google-modules/cloud-storage-dpe @terraform-google-modules/terraform-samples-reviewers
-/traffic_director/      @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
-/vpc/                   @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
-/managedkafka/          @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers
-/backupdr/              @terraform-google-modules/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers
+/bigquery/                    @terraform-google-modules/bigquery-terraform-swe @terraform-google-modules/terraform-samples-reviewers
+/cloud_sql/                   @terraform-google-modules/terraform-samples-reviewers
+/cloudvpn/                    @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
+/composer/                    @terraform-google-modules/cloud-dpes-composer @terraform-google-modules/terraform-samples-reviewers
+/compute/                     @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
+/dns/                         @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
+/gke/                         @terraform-google-modules/eks-team @terraform-google-modules/terraform-samples-reviewers
+/lb/                          @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
+/looker/                      @terraform-google-modules/cloud-looker-docs @terraform-google-modules/terraform-samples-reviewers
+/media_cdn/                   @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
+/network_connectivity/        @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
+/network_security/mirroring/  @terraform-google-modules/pm2-team @terraform-google-modules/terraform-samples-reviewers
+/privateca/                   @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
+/storage/                     @terraform-google-modules/cloud-storage-dpe @terraform-google-modules/terraform-samples-reviewers
+/traffic_director/            @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
+/vpc/                         @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
+/managedkafka/                @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers
+/backupdr/                    @terraform-google-modules/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers
diff --git a/test/setup/main.tf b/test/setup/main.tf
index 2348d252..e07650b8 100644
--- a/test/setup/main.tf
+++ b/test/setup/main.tf
@@ -25,7 +25,7 @@ locals {
 module "projects" {
   count   = local.num_projects
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   name                     = "ci-tf-samples-${count.index}"
   random_project_id        = true
@@ -64,6 +64,7 @@ module "projects" {
     "looker.googleapis.com",
     "networkconnectivity.googleapis.com",
     "networkmanagement.googleapis.com",
+    "networksecurity.googleapis.com",
     "notebooks.googleapis.com",
     "privateca.googleapis.com",
     "pubsub.googleapis.com",