diff --git a/GNUmakefile b/GNUmakefile
index f5276e3a..8a21acbe 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,11 +9,11 @@ build: fmtcheck
 
 build13: GOOS=$(shell go env GOOS)
 build13: GOARCH=$(shell go env GOARCH)
-build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(AVI_PROVIDER_NAMESPACE)/31.1.1/$(GOOS)_$(GOARCH)
+build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(AVI_PROVIDER_NAMESPACE)/30.2.1/$(GOOS)_$(GOARCH)
 build13: fmtcheck
 	@echo "==> Installing plugin to $(DESTINATION)"
 	@mkdir -p $(DESTINATION)
-	go build -o $(DESTINATION)/terraform-provider-avi_v31.1.1
+	go build -o $(DESTINATION)/terraform-provider-avi_v30.2.1
 
 test: fmtcheck
 	go test -i $(TEST) || exit 1
diff --git a/README.md b/README.md
index 32e89efe..06b44010 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Requirements
 ------------
 
 -	[Terraform](https://www.terraform.io/downloads.html) 0.12.x/0.13+ (0.11.x or lower is incompatible)
--	[Go](https://golang.org/doc/install) 1.23.4 (to build the provider plugin)
+-	[Go](https://golang.org/doc/install) 1.13 (to build the provider plugin)
 
 Building The Provider (Terraform v0.12+)
 ----------------------------------------
diff --git a/avi/data_source_avi_controllerproperties_test.go b/avi/data_source_avi_controllerproperties_test.go
index f2d47ff8..ab0a9bce 100644
--- a/avi/data_source_avi_controllerproperties_test.go
+++ b/avi/data_source_avi_controllerproperties_test.go
@@ -45,8 +45,14 @@ func TestAVIDataSourceControllerPropertiesBasic(t *testing.T) {
 						"avi_controllerproperties.testControllerProperties", "enable_memory_balancer", "true"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "max_dead_se_in_grp", "1"),
+					resource.TestCheckResourceAttr(
+						"avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"),
+					resource.TestCheckResourceAttr(
+						"avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"),
+					resource.TestCheckResourceAttr(
+						"avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"),
 					resource.TestCheckResourceAttr(
@@ -119,7 +125,10 @@ resource "avi_controllerproperties" "testControllerProperties" {
 	max_pcap_per_tenant = "4"
 	enable_memory_balancer = true
 	max_dead_se_in_grp = "1"
+	seupgrade_fabric_pool_size = "20"
 	vs_key_rotate_period = "60"
+	seupgrade_segroup_min_dead_timeout = "360"
+	upgrade_lease_time = "360"
 	se_create_timeout = "900"
 	query_host_fail = "180"
 	bm_use_ansible = true
diff --git a/avi/resource_avi_controllerproperties_test.go b/avi/resource_avi_controllerproperties_test.go
index 5cc1d176..f7d4a404 100644
--- a/avi/resource_avi_controllerproperties_test.go
+++ b/avi/resource_avi_controllerproperties_test.go
@@ -49,6 +49,10 @@ func TestAVIControllerPropertiesBasic(t *testing.T) {
 						"avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"),
+					resource.TestCheckResourceAttr(
+						"avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"),
+					resource.TestCheckResourceAttr(
+						"avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"),
 					resource.TestCheckResourceAttr(
@@ -135,6 +139,10 @@ func TestAVIControllerPropertiesBasic(t *testing.T) {
 						"avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"),
+					resource.TestCheckResourceAttr(
+						"avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"),
+					resource.TestCheckResourceAttr(
+						"avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"),
 					resource.TestCheckResourceAttr(
@@ -238,6 +246,8 @@ resource "avi_controllerproperties" "testControllerProperties" {
 	max_dead_se_in_grp = "1"
 	seupgrade_fabric_pool_size = "20"
 	vs_key_rotate_period = "60"
+	seupgrade_segroup_min_dead_timeout = "360"
+	upgrade_lease_time = "360"
 	se_create_timeout = "900"
 	query_host_fail = "180"
 	bm_use_ansible = true
@@ -284,6 +294,8 @@ resource "avi_controllerproperties" "testControllerProperties" {
 	max_dead_se_in_grp = "1"
 	seupgrade_fabric_pool_size = "20"
 	vs_key_rotate_period = "60"
+	seupgrade_segroup_min_dead_timeout = "360"
+	upgrade_lease_time = "360"
 	se_create_timeout = "900"
 	query_host_fail = "180"
 	bm_use_ansible = true