diff --git a/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml b/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
index f41e8dfe..bf7cd8aa 100644
--- a/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
+++ b/deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
@@ -72,7 +72,7 @@ spec:
       serviceAccount: csi-snapshotter
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.5.0
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -84,7 +84,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-snapshotter
-          image: quay.io/k8scsi/csi-snapshotter:canary
+          image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -97,7 +97,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: hostpath
-          image: quay.io/k8scsi/hostpathplugin:v1.2.0
+          image: k8s.gcr.io/sig-storage/hostpathplugin:v1.4.0
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
diff --git a/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml b/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
index ec402c93..6b12d276 100644
--- a/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
+++ b/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
@@ -25,7 +25,7 @@ spec:
       serviceAccount: snapshot-controller
       containers:
         - name: snapshot-controller
-          image: quay.io/k8scsi/snapshot-controller:canary
+          image: k8s.gcr.io/sig-storage/snapshot-controller:v3.0.0
           args:
             - "--v=5"
             - "--leader-election=false"
diff --git a/deploy/kubernetes/webhook-example/README.md b/deploy/kubernetes/webhook-example/README.md
index 05b15bcd..cc310fd9 100644
--- a/deploy/kubernetes/webhook-example/README.md
+++ b/deploy/kubernetes/webhook-example/README.md
@@ -23,7 +23,7 @@ make
 Build the docker image
 
 ```bash
-docker build -t validation-webhook:latest -f ./cmd/validation-webhook/Dockerfile .
+docker build -t snapshot-validation-webhook:latest -f ./cmd/validation-webhook/Dockerfile .
 ```
 
 ## How to deploy the webhook
@@ -78,4 +78,4 @@ Look into [cert-manager](https://cert-manager.io/) to handle the certificates, a
 
 #### Important
 
-Please see the deployment [yaml](./webhook.yaml) for the arguments expected by the webhook server. The snapshot validation webhook is served at the path `/snapshot`.
+Please see the deployment [yaml](./webhook.yaml) for the arguments expected by the webhook server. The snapshot validation webhook is served at the path `/volumesnapshot`.
diff --git a/deploy/kubernetes/webhook-example/admission-configuration-template b/deploy/kubernetes/webhook-example/admission-configuration-template
index bca65009..bbcf9b64 100644
--- a/deploy/kubernetes/webhook-example/admission-configuration-template
+++ b/deploy/kubernetes/webhook-example/admission-configuration-template
@@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   name: "validation-webhook.snapshot.storage.k8s.io"
-  namespace: "default"
 webhooks:
 - name: "validation-webhook.snapshot.storage.k8s.io"
   rules:
@@ -20,4 +19,4 @@ webhooks:
   admissionReviewVersions: ["v1", "v1beta1"]
   sideEffects: None
   failurePolicy: Ignore # We recommend switching to Fail only after successful installation of the webhook server and webhook.
-  timeoutSeconds: 2 # This will affect the latency and performance. Finetune this value based on your application's tolerance.
\ No newline at end of file
+  timeoutSeconds: 2 # This will affect the latency and performance. Finetune this value based on your application's tolerance.
diff --git a/deploy/kubernetes/webhook-example/create-cert.sh b/deploy/kubernetes/webhook-example/create-cert.sh
index 58ad2e2b..d7dbe22a 100755
--- a/deploy/kubernetes/webhook-example/create-cert.sh
+++ b/deploy/kubernetes/webhook-example/create-cert.sh
@@ -122,5 +122,5 @@ echo ${serverCert} | openssl base64 -d -A -out ${tmpdir}/server-cert.pem
 kubectl create secret generic ${secret} \
         --from-file=key.pem=${tmpdir}/server-key.pem \
         --from-file=cert.pem=${tmpdir}/server-cert.pem \
-        --dry-run -o yaml |
+        --dry-run=client -o yaml |
     kubectl -n ${namespace} apply -f -
diff --git a/deploy/kubernetes/webhook-example/webhook.yaml b/deploy/kubernetes/webhook-example/webhook.yaml
index d43a1c99..f5054ddd 100644
--- a/deploy/kubernetes/webhook-example/webhook.yaml
+++ b/deploy/kubernetes/webhook-example/webhook.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: snapshot-validation
-        image: k8s.gcr.io/sig-storage/validation-webhook:v2.2.0 # change the image if you wish to use your own custom validation server image
+        image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v3.0.0 # change the image if you wish to use your own custom validation server image
         args: ['--tls-cert-file=/etc/snapshot-validation-webhook/certs/cert.pem', '--tls-private-key-file=/etc/snapshot-validation-webhook/certs/key.pem']
         ports:
         - containerPort: 443 # change the port as needed