diff --git a/Makefile b/Makefile
index 2b4dc9b77..689b458d7 100644
--- a/Makefile
+++ b/Makefile
@@ -256,11 +256,7 @@ getccmconfigs:
 	mkdir -p bin/configs
 	cp deploy/ccm/* bin/configs/
 
-getconfigs:
-	cp deploy/plugin/* bin/configs/
-	cp deploy/windows/* bin/configs/
-
-getconfigs: cleanconfigs getccmconfigs getconfigs
+getconfigs: cleanconfigs getccmconfigs
 	wget -q '$(PX_DOC_HOST)/samples/k8s/pxc/portworx-prometheus-rule.yaml' -P bin/configs --no-check-certificate
 	wget -q '$(PROMETHEUS_OPERATOR_CRD_URL_PREFIX)/crd-alertmanagerconfigs.yaml' -O bin/configs/prometheus-crd-alertmanagerconfigs.yaml
 	wget -q '$(PROMETHEUS_OPERATOR_CRD_URL_PREFIX)/crd-alertmanagers.yaml' -O bin/configs/prometheus-crd-alertmanagers.yaml
@@ -276,6 +272,8 @@ getconfigs: cleanconfigs getccmconfigs getconfigs
 	wget -q '$(CSI_SNAPSHOTTER_V4_CRD_URL_PREFIX)/snapshot.storage.k8s.io_volumesnapshots.yaml' -O bin/configs/csi-crd-v4-volumesnapshot.yaml
 	wget -q '$(CSI_SNAPSHOTTER_V4_CRD_URL_PREFIX)/snapshot.storage.k8s.io_volumesnapshotcontents.yaml' -O bin/configs/csi-crd-v4-volumesnapshotcontent.yaml
 	wget -q '$(CSI_SNAPSHOTTER_V4_CRD_URL_PREFIX)/snapshot.storage.k8s.io_volumesnapshotclasses.yaml' -O bin/configs/csi-crd-v4-volumesnapshotclass.yaml
+	cp deploy/plugin/* bin/configs/
+	cp deploy/windows/* bin/configs
 
 clean-release-manifest:
 	rm -rf manifests
diff --git a/drivers/storage/portworx/component/csi.go b/drivers/storage/portworx/component/csi.go
index eae12cfd5..811e667d4 100644
--- a/drivers/storage/portworx/component/csi.go
+++ b/drivers/storage/portworx/component/csi.go
@@ -582,10 +582,8 @@ func getCSIDeploymentSpec(
 	topologySpreadConstraints []v1.TopologySpreadConstraint,
 ) *appsv1.Deployment {
 	replicas := int32(3)
-	// leaderElectionType := "leases"
 	provisionerLeaderElectionType := "leases"
 	if csiConfig.IncludeEndpointsAndConfigMapsForLeases {
-		// leaderElectionType = "configmaps"
 		provisionerLeaderElectionType = "endpoints"
 	}
 	imagePullPolicy := pxutil.ImagePullPolicy(cluster)
diff --git a/drivers/storage/portworx/component/windows.go b/drivers/storage/portworx/component/windows.go
index 44874ca7e..8470741ff 100644
--- a/drivers/storage/portworx/component/windows.go
+++ b/drivers/storage/portworx/component/windows.go
@@ -111,7 +111,7 @@ func (w *windows) createDaemonSet(filename string, ownerRef *metav1.OwnerReferen
 	}
 
 	daemonSet.Namespace = cluster.Namespace
-	// daemonSet.OwnerReferences = []metav1.OwnerReference{*ownerRef}
+	daemonSet.OwnerReferences = []metav1.OwnerReference{*ownerRef}
 
 	existingDaemonSet := &appsv1.DaemonSet{}
 	getErr := w.client.Get(
@@ -129,7 +129,7 @@ func (w *windows) createDaemonSet(filename string, ownerRef *metav1.OwnerReferen
 	// pxutil.ApplyStorageClusterSettingsToPodSpec(cluster, &daemonSet.Spec.Template.Spec)
 
 	equal, _ := util.DeepEqualPodTemplate(&daemonSet.Spec.Template, &existingDaemonSet.Spec.Template)
-	if !equal && w.isWindowsNode {
+	if !equal && !w.isCreated {
 		if err := k8s.CreateOrUpdateDaemonSet(w.client, daemonSet, nil); err != nil {
 			return err
 		}