diff --git a/terraform/main.tf b/terraform/main.tf
index 4860837..50442f0 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -143,10 +143,13 @@ resource "google_container_cluster" "primary" {
     }
   }
   network_policy {
-    enabled  = true
-    provider = "CALICO"
+    enabled  = var.enable_dataplane_v2 ? false : true
+    provider = var.enable_dataplane_v2 ? "PROVIDER_UNSPECIFIED" : "CALICO"
   }
 
+  # Setting dataplane v2 for GKE
+  datapath_provider = var.enable_dataplane_v2 ? "ADVANCED_DATAPATH" : "LEGACY_DATAPATH"
+
   dynamic "resource_usage_export_config" {
     for_each = var.enable_gke_metered_billing ? ["placeholder"] : []
     content {
diff --git a/terraform/variables.tf b/terraform/variables.tf
index ec1f0b1..cbf3dc3 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -9,7 +9,7 @@ variable "dns_managed_zone" {
 }
 
 variable "kube_version_gke" {
-  default     = "1.24.12-gke.500"
+  default     = "1.24.15-gke.1700"
   description = "The kubernetes version to use in GKE"
 }
 
@@ -581,3 +581,9 @@ variable "enable_istio" {
   default = "false"
   type    = string
 }
+
+
+variable "enable_dataplane_v2" {
+  default = "false"
+  type    = bool
+}