diff --git a/modules/gcp/baseline-monitoring/00_foundation.tf b/modules/gcp/baseline-monitoring/00_foundation.tf
new file mode 100644
index 0000000..173184a
--- /dev/null
+++ b/modules/gcp/baseline-monitoring/00_foundation.tf
@@ -0,0 +1,17 @@
+variable "infra_ops_project_id" {
+  description = "The ID of the central Infra-Ops project (e.g., cloudkite-infra-ops)"
+  type        = string
+}
+
+variable "monitored_project_ids" {
+  description = "List of project IDs to monitor (e.g., cloudkite-dev, cloudkite-prod)"
+  type        = list(string)
+}
+
+# Link the projects (Metrics Scope)
+resource "google_monitoring_monitored_project" "projects" {
+  for_each = toset(var.monitored_project_ids)
+
+  metrics_scope = var.infra_ops_project_id
+  name          = each.value
+}
diff --git a/modules/gcp/baseline-monitoring/01_infrastructure.tf b/modules/gcp/baseline-monitoring/01_infrastructure.tf
new file mode 100644
index 0000000..92d4035
--- /dev/null
+++ b/modules/gcp/baseline-monitoring/01_infrastructure.tf
@@ -0,0 +1,25 @@
+# LOG-BASED METRICS (Iterated per project)
+resource "google_logging_metric" "oom_events" {
+  for_each = toset(var.monitored_project_ids)
+
+  name    = "k8s_oom_events"
+  project = each.value
+  
+  description = "Count of OOMKilled events from GKE containers"
+  filter      = "resource.type=\"k8s_container\" AND textPayload:\"OOMKilled\""
+  
+  metric_descriptor {
+    metric_kind = "DELTA"
+    value_type  = "INT64"
+    unit        = "1"
+  }
+}
+
+# INFRASTRUCTURE DASHBOARD
+# resource "google_monitoring_dashboard" "infrastructure_dashboard" {
+#   project      = var.infra_ops_project_id
+  
+#   dashboard_json = <<EOF
+# {}
+# EOF
+# }
diff --git a/modules/gcp/baseline-monitoring/versions.tf b/modules/gcp/baseline-monitoring/versions.tf
new file mode 100644
index 0000000..fd6269f
--- /dev/null
+++ b/modules/gcp/baseline-monitoring/versions.tf
@@ -0,0 +1,9 @@
+terraform {
+  required_version = ">=1.13.0"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">=7.0.0"
+    }
+  }
+}
diff --git a/modules/gcp/vpc/main.tf b/modules/gcp/vpc/main.tf
index f2f41b8..049c6de 100644
--- a/modules/gcp/vpc/main.tf
+++ b/modules/gcp/vpc/main.tf
@@ -13,16 +13,14 @@ resource "google_compute_subnetwork" "gke-subnetwork" {
   network                  = google_compute_network.network.name
   project                  = var.project
 
-  secondary_ip_range = [
-    {
-      range_name    = "${var.region}-gke-services"
-      ip_cidr_range = "${var.network-prefix}.32.0/19"
-    },
-    {
-      range_name    = "${var.region}-gke-pods"
-      ip_cidr_range = "${var.network-prefix}.128.0/17"
-    }
-  ]
+  secondary_ip_range {
+    range_name    = "${var.region}-gke-services"
+    ip_cidr_range = "${var.network-prefix}.32.0/19"
+  }
+  secondary_ip_range {
+    range_name    = "${var.region}-gke-pods"
+    ip_cidr_range = "${var.network-prefix}.128.0/17"
+  }
 }
 
 resource "google_compute_address" "nat-address" {