diff --git a/pkg/common/constants.go b/pkg/common/constants.go
index 46a6d57b2..387588d42 100644
--- a/pkg/common/constants.go
+++ b/pkg/common/constants.go
@@ -70,10 +70,6 @@ var Gen4MachineHyperdiskAttachLimitMap = []struct {
 	max   int64
 	value int64
 }{
-	{max: 4, value: 15},
-	{max: 8, value: 23},
-	{max: 16, value: 31},
-	{max: 32, value: 49},
-	{max: 64, value: 63},
-	{max: 1024, value: 127},
+	{max: 8, value: 15},
+	{max: 1024, value: 31},
 }
diff --git a/pkg/gce-pd-csi-driver/node_test.go b/pkg/gce-pd-csi-driver/node_test.go
index 4d2883ee8..514fad38e 100644
--- a/pkg/gce-pd-csi-driver/node_test.go
+++ b/pkg/gce-pd-csi-driver/node_test.go
@@ -271,12 +271,12 @@ func TestNodeGetVolumeLimits(t *testing.T) {
 		{
 			name:           "c4-standard-192",
 			machineType:    "c4-standard-192",
-			expVolumeLimit: 127,
+			expVolumeLimit: 31,
 		},
 		{
 			name:           "c4-standard-48",
 			machineType:    "c4-standard-48",
-			expVolumeLimit: 63,
+			expVolumeLimit: 31,
 		},
 		{
 			name:           "c4a-standard-4",
@@ -302,7 +302,7 @@ func TestNodeGetVolumeLimits(t *testing.T) {
 		{
 			name:           "n4-custom-8-12345-ext",
 			machineType:    "n4-custom-8-12345-ext",
-			expVolumeLimit: 23,
+			expVolumeLimit: 15,
 		},
 		{
 			name:           "n4-custom-16-12345",
@@ -312,7 +312,7 @@ func TestNodeGetVolumeLimits(t *testing.T) {
 		{
 			name:           "invalid gen4 machine type",
 			machineType:    "n4-highcpu-4xyz",
-			expVolumeLimit: volumeLimitBig,
+			expVolumeLimit: 127,
 			expectError:    true,
 		},
 		{
@@ -338,12 +338,12 @@ func TestNodeGetVolumeLimits(t *testing.T) {
 		{
 			name:           "c4a-standard-32-lssd",
 			machineType:    "c4a-standard-32-lssd",
-			expVolumeLimit: 49,
+			expVolumeLimit: 31,
 		},
 		{
 			name:           "c4d-standard-32",
 			machineType:    "c4d-standard-32",
-			expVolumeLimit: 49,
+			expVolumeLimit: 31,
 		},
 	}