diff --git a/CHANGELOG.md b/CHANGELOG.md
index d409b401..20ae4d18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.33.6 (October, 1 2024)
+
+### Notes
+
+- Release date: **(October, 1 2024)**
+- Supported Terraform version: **v1.x**
+
+### Bug Fixes
+- [PR #495](https://github.com/zscaler/terraform-provider-zpa/pull/495) - Fixed issue with attribute `tcp_port_range` and `udp_port_range` within the resource `zpa_application_segment` 
+
 ## 3.33.5 (September, 30 2024)
 
 ### Notes
diff --git a/GNUmakefile b/GNUmakefile
index e30dc924..a6def29a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -55,14 +55,14 @@ test\:integration\:zpa:
 build13: GOOS=$(shell go env GOOS)
 build13: GOARCH=$(shell go env GOARCH)
 ifeq ($(OS),Windows_NT)  # is Windows_NT on XP, 2000, 7, Vista, 10...
-build13: DESTINATION=$(APPDATA)/terraform.d/plugins/$(ZPA_PROVIDER_NAMESPACE)/3.33.5/$(GOOS)_$(GOARCH)
+build13: DESTINATION=$(APPDATA)/terraform.d/plugins/$(ZPA_PROVIDER_NAMESPACE)/3.33.6/$(GOOS)_$(GOARCH)
 else
-build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(ZPA_PROVIDER_NAMESPACE)/3.33.5/$(GOOS)_$(GOARCH)
+build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(ZPA_PROVIDER_NAMESPACE)/3.33.6/$(GOOS)_$(GOARCH)
 endif
 build13: fmtcheck
 	@echo "==> Installing plugin to $(DESTINATION)"
 	@mkdir -p $(DESTINATION)
-	go build -o $(DESTINATION)/terraform-provider-zpa_v3.33.5
+	go build -o $(DESTINATION)/terraform-provider-zpa_v3.33.6
 
 vet:
 	@echo "==> Checking source code against go vet and staticcheck"
diff --git a/docs/guides/release-notes.md b/docs/guides/release-notes.md
index 68000d16..196b540c 100644
--- a/docs/guides/release-notes.md
+++ b/docs/guides/release-notes.md
@@ -12,10 +12,20 @@ Track all ZPA Terraform provider's releases. New resources, features, and bug fi
 
 ---
 
-``Last updated: v3.33.5``
+``Last updated: v3.33.6``
 
 ---
 
+## 3.33.6 (October, 1 2024)
+
+### Notes
+
+- Release date: **(October, 1 2024)**
+- Supported Terraform version: **v1.x**
+
+### Bug Fixes
+- [PR #495](https://github.com/zscaler/terraform-provider-zpa/pull/495) - Fixed issue with attribute `tcp_port_range` and `udp_port_range` within the resource `zpa_application_segment` 
+
 ## 3.33.5 (September, 30 2024)
 
 ### Notes
diff --git a/zpa/resource_zpa_application_segment.go b/zpa/resource_zpa_application_segment.go
index 5df16dd9..51475477 100644
--- a/zpa/resource_zpa_application_segment.go
+++ b/zpa/resource_zpa_application_segment.go
@@ -36,9 +36,9 @@ func resourceApplicationSegment() *schema.Resource {
 
 			if bypassType, ok := d.GetOk("bypass_type"); ok && bypassType.(string) == "ALWAYS" {
 				tcpPortRange := d.Get("tcp_port_range").(*schema.Set).List()
-				tcpPortRanges := d.Get("tcp_port_ranges").([]interface{})
+				tcpPortRanges := d.Get("tcp_port_ranges").(*schema.Set).List()
 				udpPortRange := d.Get("udp_port_range").(*schema.Set).List()
-				udpPortRanges := d.Get("udp_port_ranges").([]interface{})
+				udpPortRanges := d.Get("udp_port_ranges").(*schema.Set).List()
 
 				if len(tcpPortRange) > 0 || len(tcpPortRanges) > 0 || len(udpPortRange) > 0 || len(udpPortRanges) > 0 {
 					return fmt.Errorf("TCP and UDP port configuration must be disabled as bypass_type is set to ALWAYS. In order to add ports, please change the bypass_type to NEVER or ON_NET")
@@ -125,7 +125,7 @@ func resourceApplicationSegment() *schema.Resource {
 			"tcp_port_range": resourceAppSegmentPortRange("tcp port range"),
 			"udp_port_range": resourceAppSegmentPortRange("udp port range"),
 			"tcp_port_ranges": {
-				Type:        schema.TypeList,
+				Type:        schema.TypeSet,
 				Optional:    true,
 				Computed:    true,
 				Description: "TCP port ranges used to access the app.",
@@ -133,7 +133,7 @@ func resourceApplicationSegment() *schema.Resource {
 			},
 
 			"udp_port_ranges": {
-				Type:        schema.TypeList,
+				Type:        schema.TypeSet,
 				Optional:    true,
 				Computed:    true,
 				Description: "UDP port ranges used to access the app.",