diff --git a/pkg/gce-pd-csi-driver/node.go b/pkg/gce-pd-csi-driver/node.go
index 8ba465a9e..d940f690e 100644
--- a/pkg/gce-pd-csi-driver/node.go
+++ b/pkg/gce-pd-csi-driver/node.go
@@ -759,7 +759,7 @@ func (ns *GCENodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRe
 		}
 	}
 
-	nodeID := common.CreateNodeID(ns.MetadataService.GetProject(), ns.MetadataService.GetZone(), ns.GetNodeName())
+	nodeID := common.CreateNodeID(ns.MetadataService.GetProject(), ns.MetadataService.GetZone(), ns.MetadataService.GetName())
 
 	volumeLimits, err := ns.getVolumeLimits(ctx, node)
 	if err != nil {
diff --git a/pkg/gce-pd-csi-driver/node_test.go b/pkg/gce-pd-csi-driver/node_test.go
index 7cad050bd..a7ba1e52e 100644
--- a/pkg/gce-pd-csi-driver/node_test.go
+++ b/pkg/gce-pd-csi-driver/node_test.go
@@ -1875,7 +1875,7 @@ func TestNodeGetInfo(t *testing.T) {
 			desc:             "success with nodeNameOverride",
 			nodeNameOverride: "override-node-name",
 			want: &csi.NodeGetInfoResponse{
-				NodeId:            fmt.Sprintf("projects/test-project/zones/%s/instances/%s", zone, "override-node-name"),
+				NodeId:            fmt.Sprintf("projects/test-project/zones/%s/instances/%s", zone, name),
 				MaxVolumesPerNode: volumeLimitBig,
 				AccessibleTopology: &csi.Topology{
 					Segments: map[string]string{