diff --git a/assets/controller.yaml b/assets/controller.yaml
index 5ef22a5dd..9f5d09ee6 100644
--- a/assets/controller.yaml
+++ b/assets/controller.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-controller
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels:
diff --git a/assets/node.yaml b/assets/node.yaml
index b660d1b48..23a4ba383 100644
--- a/assets/node.yaml
+++ b/assets/node.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-node
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels:
diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go
index 256431808..9890923c3 100644
--- a/pkg/generated/bindata.go
+++ b/pkg/generated/bindata.go
@@ -76,6 +76,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-controller
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels:
@@ -340,6 +342,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-node
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels:
diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go
index a2a6ba82d..d116d3e1d 100644
--- a/pkg/operator/starter.go
+++ b/pkg/operator/starter.go
@@ -21,6 +21,7 @@ import (
 	"github.com/openshift/library-go/pkg/controller/controllercmd"
 	"github.com/openshift/library-go/pkg/operator/csi/csicontrollerset"
 	"github.com/openshift/library-go/pkg/operator/csi/csidrivercontrollerservicecontroller"
+	"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
 	goc "github.com/openshift/library-go/pkg/operator/genericoperatorclient"
 	"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
@@ -86,6 +87,9 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
 			"rbac/snapshotter_role.yaml",
 			"rbac/snapshotter_binding.yaml",
 		},
+	).WithCSIConfigObserverController(
+		"AWSEBSDriverCSIConfigObserverController",
+		configInformers,
 	).WithCSIDriverControllerService(
 		"AWSEBSDriverControllerServiceController",
 		withCustomCABundle(generated.MustAsset, kubeClient),
@@ -94,12 +98,14 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
 		kubeInformersForNamespaces.InformersFor(defaultNamespace),
 		configInformers,
 		csidrivercontrollerservicecontroller.WithSecretHashAnnotationHook(defaultNamespace, secretName, secretInformer),
+		csidrivercontrollerservicecontroller.WithObservedProxyDeploymentHook(),
 	).WithCSIDriverNodeService(
 		"AWSEBSDriverNodeServiceController",
 		generated.MustAsset,
 		"node.yaml",
 		kubeClient,
 		kubeInformersForNamespaces.InformersFor(defaultNamespace),
+		csidrivernodeservicecontroller.WithObservedProxyDaemonSetHook(),
 	).WithExtraInformers(secretInformer.Informer())
 
 	if err != nil {
diff --git a/pkg/operator/starter_test.go b/pkg/operator/starter_test.go
index 516894010..ecf9d8fb0 100644
--- a/pkg/operator/starter_test.go
+++ b/pkg/operator/starter_test.go
@@ -16,6 +16,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-controller
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels:
@@ -181,6 +183,8 @@ apiVersion: apps/v1
 metadata:
   name: aws-ebs-csi-driver-controller
   namespace: openshift-cluster-csi-drivers
+  annotations:
+    config.openshift.io/inject-proxy: csi-driver
 spec:
   selector:
     matchLabels: