diff --git a/templates/cluster-template-oci-addons.yaml b/templates/cluster-template-oci-addons.yaml
index 3f3829c0..5df24f02 100644
--- a/templates/cluster-template-oci-addons.yaml
+++ b/templates/cluster-template-oci-addons.yaml
@@ -219,10 +219,10 @@ data:
           - key: node.cloudprovider.kubernetes.io/uninitialized
             value: "true"
             effect: NoSchedule
-          - key: node-role.kubernetes.io/master
+          - key: node-role.kubernetes.io/control-plane
             operator: Exists
             effect: NoSchedule
-          - key: node-role.kubernetes.io/control-plane
+          - key: node-role.kubernetes.io/master
             operator: Exists
             effect: NoSchedule
           volumes:
@@ -234,12 +234,13 @@ data:
                 path: /etc/kubernetes
           containers:
             - name: oci-cloud-controller-manager
-              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
               command: ["/usr/local/bin/oci-cloud-controller-manager"]
               args:
                 - --cloud-config=/etc/oci/cloud-provider.yaml
                 - --cloud-provider=oci
-                - --leader-elect-resource-lock=configmapsleases
+                - --leader-elect-resource-lock=leases
+                - --concurrent-service-syncs=3
                 - --v=2
               volumeMounts:
                 - name: cfg
@@ -284,7 +285,7 @@ data:
       - list
       - watch
       - patch
-
+      - get
     - apiGroups:
       - ""
       resources:
@@ -380,6 +381,9 @@ data:
       - serviceaccounts
       verbs:
       - create
+      - list
+      - get
+      - watch
     - apiGroups:
       - ""
       resources:
@@ -465,7 +469,7 @@ data:
             node-role.kubernetes.io/control-plane: ""
           containers:
             - name: csi-volume-provisioner
-              image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+              image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --volume-name-prefix=csi
@@ -480,7 +484,7 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-fss-volume-provisioner
-              image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+              image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi-fss.sock
                 - --volume-name-prefix=csi-fss
@@ -495,7 +499,7 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-attacher
-              image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
+              image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --timeout=120s
@@ -508,7 +512,24 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-resizer
-              image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
+              image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
+              args:
+                - --csi-address=/var/run/shared-tmpfs/csi.sock
+                - --leader-election
+              imagePullPolicy: "IfNotPresent"
+              volumeMounts:
+                - mountPath: /var/run/shared-tmpfs
+                  name: shared-tmpfs
+            - name: snapshot-controller
+              image: registry.k8s.io/sig-storage/snapshot-controller:v6.2.0
+              args:
+                - --leader-election
+              imagePullPolicy: "IfNotPresent"
+              volumeMounts:
+                - mountPath: /var/run/shared-tmpfs
+                  name: shared-tmpfs
+            - name: csi-snapshotter
+              image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --leader-election
@@ -522,7 +543,7 @@ data:
                 - --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
               command:
                 - /usr/local/bin/oci-csi-controller-driver
-              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
               imagePullPolicy: IfNotPresent
               volumeMounts:
                 - name: config
@@ -673,7 +694,7 @@ data:
                       fieldPath: spec.nodeName
                 - name: PATH
                   value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
-              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
               securityContext:
                 privileged: true
               volumeMounts:
@@ -687,6 +708,7 @@ data:
                 - mountPath: /dev
                   name: device-dir
                 - mountPath: /host
+                  mountPropagation: HostToContainer
                   name: host-root
                 - mountPath: /sbin/iscsiadm
                   name: chroot-iscsiadm
@@ -707,7 +729,7 @@ data:
               args:
                 - --csi-address=/csi/csi.sock
                 - --kubelet-registration-path=/var/lib/kubelet/plugins/blockvolume.csi.oraclecloud.com/csi.sock
-              image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
+              image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
               securityContext:
                 privileged: true
               lifecycle:
@@ -726,7 +748,7 @@ data:
               args:
                 - --csi-address=/fss/csi.sock
                 - --kubelet-registration-path=/var/lib/kubelet/plugins/fss.csi.oraclecloud.com/csi.sock
-              image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
+              image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
               securityContext:
                 privileged: true
               lifecycle:
@@ -805,65 +827,65 @@ data:
       name: csi-oci
       namespace: kube-system
     rules:
-      - apiGroups: [""]
-        resources: ["events"]
-        verbs: ["get", "list", "watch", "create", "update", "patch"]
-      - apiGroups: [""]
-        resources: ["nodes"]
-        verbs: ["get", "list", "watch"]
-      - apiGroups: ["volume.oci.oracle.com"]
-        resources: ["blockscsiinfos"]
-        verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
-      - apiGroups: [""]
-        resources: ["persistentvolumes"]
-        verbs: ["get", "list", "watch", "create", "delete", "patch"]
-      - apiGroups: [""]
-        resources: ["persistentvolumeclaims"]
-        verbs: ["get", "list", "watch", "update", "create"]
-      - apiGroups: ["storage.k8s.io"]
-        resources: ["storageclasses", "volumeattachments", "volumeattachments/status", "csinodes"]
-        verbs: ["get", "list", "watch", "patch"]
-      - apiGroups: ["coordination.k8s.io"]
-        resources: ["leases"]
-        verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
-      - apiGroups: [""]
-        resources: ["endpoints"]
-        verbs: ["get", "watch", "create", "update"]
-      - apiGroups: [""]
-        resources: ["pods"]
-        verbs: ["get", "list", "watch"]
-      - apiGroups: [""]
-        resources: ["persistentvolumeclaims/status"]
-        verbs: ["patch"]
-      - apiGroups: [ "snapshot.storage.k8s.io" ]
-        resources: [ "volumesnapshotclasses" ]
-        verbs: [ "get", "list", "watch" ]
-      - apiGroups: [ "snapshot.storage.k8s.io" ]
-        resources: [ "volumesnapshotcontents" ]
-        verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
-      - apiGroups: [ "snapshot.storage.k8s.io" ]
-        resources: [ "volumesnapshotcontents/status" ]
-        verbs: [ "update", "patch" ]
-      - apiGroups: [ "snapshot.storage.k8s.io" ]
-        resources: [ "volumesnapshots" ]
-        verbs: [ "get", "list", "watch", "update", "patch" ]
-      - apiGroups: [ "snapshot.storage.k8s.io" ]
-        resources: [ "volumesnapshots/status" ]
-        verbs: [ "update", "patch" ]
+     - apiGroups: [""]
+       resources: ["events"]
+       verbs: ["get", "list", "watch", "create", "update", "patch"]
+     - apiGroups: [""]
+       resources: ["nodes"]
+       verbs: ["get", "list", "watch"]
+     - apiGroups: ["volume.oci.oracle.com"]
+       resources: ["blockscsiinfos"]
+       verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
+     - apiGroups: [""]
+       resources: ["persistentvolumes"]
+       verbs: ["get", "list", "watch", "create", "delete", "patch"]
+     - apiGroups: [""]
+       resources: ["persistentvolumeclaims"]
+       verbs: ["get", "list", "watch", "update", "create"]
+     - apiGroups: ["storage.k8s.io"]
+       resources: ["storageclasses", "volumeattachments", "volumeattachments/status", "csinodes"]
+       verbs: ["get", "list", "watch", "patch"]
+     - apiGroups: ["coordination.k8s.io"]
+       resources: ["leases"]
+       verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
+     - apiGroups: [""]
+       resources: ["endpoints"]
+       verbs: ["get", "watch", "create", "update"]
+     - apiGroups: [""]
+       resources: ["pods"]
+       verbs: ["get", "list", "watch"]
+     - apiGroups: [""]
+       resources: ["persistentvolumeclaims/status"]
+       verbs: ["patch"]
+     - apiGroups: [ "snapshot.storage.k8s.io" ]
+       resources: [ "volumesnapshotclasses" ]
+       verbs: [ "get", "list", "watch" ]
+     - apiGroups: [ "snapshot.storage.k8s.io" ]
+       resources: [ "volumesnapshotcontents" ]
+       verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
+     - apiGroups: [ "snapshot.storage.k8s.io" ]
+       resources: [ "volumesnapshotcontents/status" ]
+       verbs: [ "update", "patch" ]
+     - apiGroups: [ "snapshot.storage.k8s.io" ]
+       resources: [ "volumesnapshots" ]
+       verbs: [ "get", "list", "watch", "update", "patch" ]
+     - apiGroups: [ "snapshot.storage.k8s.io" ]
+       resources: [ "volumesnapshots/status" ]
+       verbs: [ "update", "patch" ]
     ---
 
     kind: ClusterRoleBinding
     apiVersion: rbac.authorization.k8s.io/v1
     metadata:
-      name: csi-oci-binding
+     name: csi-oci-binding
     subjects:
-      - kind: ServiceAccount
-        name: csi-oci-node-sa
-        namespace: kube-system
+     - kind: ServiceAccount
+       name: csi-oci-node-sa
+       namespace: kube-system
     roleRef:
-      kind: ClusterRole
-      name: csi-oci
-      apiGroup: rbac.authorization.k8s.io
+     kind: ClusterRole
+     name: csi-oci
+     apiGroup: rbac.authorization.k8s.io
     ---
     kind: StorageClass
     apiVersion: storage.k8s.io/v1
diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
index c8a0bfdb..42dba032 100644
--- a/test/e2e/config/e2e_conf.yaml
+++ b/test/e2e/config/e2e_conf.yaml
@@ -8,8 +8,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v1.4.3
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/core-components.yaml
+      - name: v1.5.7
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.7/core-components.yaml
         type: url
         files:
           - sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -21,8 +21,8 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-      - name: v1.4.3
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/bootstrap-components.yaml
+      - name: v1.5.7
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.7/bootstrap-components.yaml
         type: url
         files:
           - sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -34,7 +34,7 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-      - name: v1.4.3
+      - name: v1.5.7
         value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.3/control-plane-components.yaml
         type: url
         files:
@@ -80,9 +80,9 @@ providers:
           - sourcePath: "../data/infrastructure-oci/v1beta2/metadata.yaml"
 
 variables:
-  KUBERNETES_VERSION: "v1.26.6"
-  OCI_MANAGED_KUBERNETES_VERSION: "v1.25.4"
-  OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.26.2"
+  KUBERNETES_VERSION: "v1.28.7"
+  OCI_MANAGED_KUBERNETES_VERSION: "v1.27.2"
+  OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.28.2"
   EXP_MACHINE_POOL: "true"
   EXP_CLUSTER_RESOURCE_SET: "true"
   NODE_DRAIN_TIMEOUT: "60s"
@@ -92,8 +92,8 @@ variables:
   CCM_PATH: "${PWD}/test/e2e/data/ccm/ccm.yaml"
   CONFORMANCE_WORKER_MACHINE_COUNT: "2"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
-  KUBERNETES_VERSION_UPGRADE_TO: "v1.26.6"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.25.6"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.28.7"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.1"
   KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}"
   IP_FAMILY: "IPv4"
   CLUSTER_TOPOLOGY: "true"
diff --git a/test/e2e/data/ccm/ccm.yaml b/test/e2e/data/ccm/ccm.yaml
index a8b50b77..0a754315 100644
--- a/test/e2e/data/ccm/ccm.yaml
+++ b/test/e2e/data/ccm/ccm.yaml
@@ -63,12 +63,13 @@ spec:
             path: /etc/kubernetes
       containers:
         - name: oci-cloud-controller-manager
-          image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+          image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
           command: ["/usr/local/bin/oci-cloud-controller-manager"]
           args:
             - --cloud-config=/etc/oci/cloud-provider.yaml
             - --cloud-provider=oci
-            - --leader-elect-resource-lock=configmapsleases
+            - --leader-elect-resource-lock=leases
+            - --concurrent-service-syncs=3
             - --v=2
           volumeMounts:
             - name: cfg
@@ -114,7 +115,7 @@ rules:
       - list
       - watch
       - patch
-
+      - get
   - apiGroups:
       - ""
     resources:
@@ -210,6 +211,9 @@ rules:
       - serviceaccounts
     verbs:
       - create
+      - list
+      - get
+      - watch
   - apiGroups:
       - ""
     resources:
@@ -284,7 +288,7 @@ spec:
         node-role.kubernetes.io/control-plane: ""
       containers:
         - name: csi-volume-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
+          image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
           args:
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --volume-name-prefix=csi
@@ -299,7 +303,7 @@ spec:
             - mountPath: /var/run/shared-tmpfs
               name: shared-tmpfs
         - name: csi-fss-volume-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
+          image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
           args:
             - --csi-address=/var/run/shared-tmpfs/csi-fss.sock
             - --volume-name-prefix=csi-fss
@@ -314,7 +318,7 @@ spec:
             - mountPath: /var/run/shared-tmpfs
               name: shared-tmpfs
         - name: csi-attacher
-          image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
           args:
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --timeout=120s
@@ -327,7 +331,24 @@ spec:
             - mountPath: /var/run/shared-tmpfs
               name: shared-tmpfs
         - name: csi-resizer
-          image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
+          image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
+          args:
+            - --csi-address=/var/run/shared-tmpfs/csi.sock
+            - --leader-election
+          imagePullPolicy: "IfNotPresent"
+          volumeMounts:
+            - mountPath: /var/run/shared-tmpfs
+              name: shared-tmpfs
+        - name: snapshot-controller
+          image: registry.k8s.io/sig-storage/snapshot-controller:v6.2.0
+          args:
+            - --leader-election
+          imagePullPolicy: "IfNotPresent"
+          volumeMounts:
+            - mountPath: /var/run/shared-tmpfs
+              name: shared-tmpfs
+        - name: csi-snapshotter
+          image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.0
           args:
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --leader-election
@@ -341,7 +362,7 @@ spec:
             - --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
           command:
             - /usr/local/bin/oci-csi-controller-driver
-          image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+          image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: config
@@ -500,7 +521,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: PATH
               value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
-          image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+          image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
           securityContext:
             privileged: true
           volumeMounts:
@@ -515,6 +536,7 @@ spec:
               name: device-dir
             - mountPath: /host
               name: host-root
+              mountPropagation: HostToContainer
             - mountPath: /sbin/iscsiadm
               name: chroot-iscsiadm
               subPath: iscsiadm
@@ -534,7 +556,7 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --kubelet-registration-path=/var/lib/kubelet/plugins/blockvolume.csi.oraclecloud.com/csi.sock
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
           securityContext:
             privileged: true
           lifecycle:
@@ -553,7 +575,7 @@ spec:
           args:
             - --csi-address=/fss/csi.sock
             - --kubelet-registration-path=/var/lib/kubelet/plugins/fss.csi.oraclecloud.com/csi.sock
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
           securityContext:
             privileged: true
           lifecycle:
@@ -631,51 +653,51 @@ metadata:
   name: csi-oci
   namespace: kube-system
 rules:
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["get", "list", "watch", "create", "update", "patch"]
-  - apiGroups: [""]
-    resources: ["nodes"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["volume.oci.oracle.com"]
-    resources: ["blockscsiinfos"]
-    verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
-  - apiGroups: [""]
-    resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "delete", "patch"]
-  - apiGroups: [""]
-    resources: ["persistentvolumeclaims"]
-    verbs: ["get", "list", "watch", "update", "create"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["storageclasses", "volumeattachments", "volumeattachments/status", "csinodes"]
-    verbs: ["get", "list", "watch", "patch"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
-  - apiGroups: [""]
-    resources: ["endpoints"]
-    verbs: ["get", "watch", "create", "update"]
-  - apiGroups: [""]
-    resources: ["pods"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["persistentvolumeclaims/status"]
-    verbs: ["patch"]
-  - apiGroups: [ "snapshot.storage.k8s.io" ]
-    resources: [ "volumesnapshotclasses" ]
-    verbs: [ "get", "list", "watch" ]
-  - apiGroups: [ "snapshot.storage.k8s.io" ]
-    resources: [ "volumesnapshotcontents" ]
-    verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
-  - apiGroups: [ "snapshot.storage.k8s.io" ]
-    resources: [ "volumesnapshotcontents/status" ]
-    verbs: [ "update", "patch" ]
-  - apiGroups: [ "snapshot.storage.k8s.io" ]
-    resources: [ "volumesnapshots" ]
-    verbs: [ "get", "list", "watch", "update", "patch" ]
-  - apiGroups: [ "snapshot.storage.k8s.io" ]
-    resources: [ "volumesnapshots/status" ]
-    verbs: [ "update", "patch" ]
+ - apiGroups: [""]
+   resources: ["events"]
+   verbs: ["get", "list", "watch", "create", "update", "patch"]
+ - apiGroups: [""]
+   resources: ["nodes"]
+   verbs: ["get", "list", "watch"]
+ - apiGroups: ["volume.oci.oracle.com"]
+   resources: ["blockscsiinfos"]
+   verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
+ - apiGroups: [""]
+   resources: ["persistentvolumes"]
+   verbs: ["get", "list", "watch", "create", "delete", "patch"]
+ - apiGroups: [""]
+   resources: ["persistentvolumeclaims"]
+   verbs: ["get", "list", "watch", "update", "create"]
+ - apiGroups: ["storage.k8s.io"]
+   resources: ["storageclasses", "volumeattachments", "volumeattachments/status", "csinodes"]
+   verbs: ["get", "list", "watch", "patch"]
+ - apiGroups: ["coordination.k8s.io"]
+   resources: ["leases"]
+   verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
+ - apiGroups: [""]
+   resources: ["endpoints"]
+   verbs: ["get", "watch", "create", "update"]
+ - apiGroups: [""]
+   resources: ["pods"]
+   verbs: ["get", "list", "watch"]
+ - apiGroups: [""]
+   resources: ["persistentvolumeclaims/status"]
+   verbs: ["patch"]
+ - apiGroups: [ "snapshot.storage.k8s.io" ]
+   resources: [ "volumesnapshotclasses" ]
+   verbs: [ "get", "list", "watch" ]
+ - apiGroups: [ "snapshot.storage.k8s.io" ]
+   resources: [ "volumesnapshotcontents" ]
+   verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
+ - apiGroups: [ "snapshot.storage.k8s.io" ]
+   resources: [ "volumesnapshotcontents/status" ]
+   verbs: [ "update", "patch" ]
+ - apiGroups: [ "snapshot.storage.k8s.io" ]
+   resources: [ "volumesnapshots" ]
+   verbs: [ "get", "list", "watch", "update", "patch" ]
+ - apiGroups: [ "snapshot.storage.k8s.io" ]
+   resources: [ "volumesnapshots/status" ]
+   verbs: [ "update", "patch" ]
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/test/e2e/data/infrastructure-oci/bases/ccm.yaml b/test/e2e/data/infrastructure-oci/bases/ccm.yaml
index 3870385c..ef7c7228 100644
--- a/test/e2e/data/infrastructure-oci/bases/ccm.yaml
+++ b/test/e2e/data/infrastructure-oci/bases/ccm.yaml
@@ -94,12 +94,13 @@ data:
                 path: /etc/kubernetes
           containers:
             - name: oci-cloud-controller-manager
-              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
               command: ["/usr/local/bin/oci-cloud-controller-manager"]
               args:
                 - --cloud-config=/etc/oci/cloud-provider.yaml
                 - --cloud-provider=oci
-                - --leader-elect-resource-lock=configmapsleases
+                - --leader-elect-resource-lock=leases
+                - --concurrent-service-syncs=3
                 - --v=2
               volumeMounts:
                 - name: cfg
@@ -145,7 +146,7 @@ data:
           - list
           - watch
           - patch
-    
+          - get
       - apiGroups:
           - ""
         resources:
@@ -242,6 +243,9 @@ data:
           - serviceaccounts
         verbs:
           - create
+          - list
+          - get
+          - watch
       - apiGroups:
           - ""
         resources:
@@ -272,7 +276,7 @@ data:
       - kind: ServiceAccount
         name: cloud-controller-manager
         namespace: kube-system
-
+        
 kind: ConfigMap
 metadata:
   annotations:
@@ -328,7 +332,7 @@ data:
             node-role.kubernetes.io/control-plane: ""
           containers:
             - name: csi-volume-provisioner
-              image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
+              image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --volume-name-prefix=csi
@@ -343,7 +347,7 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-fss-volume-provisioner
-              image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
+              image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi-fss.sock
                 - --volume-name-prefix=csi-fss
@@ -358,7 +362,7 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-attacher
-              image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
+              image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --timeout=120s
@@ -371,7 +375,7 @@ data:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
             - name: csi-resizer
-              image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
+              image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
               args:
                 - --csi-address=/var/run/shared-tmpfs/csi.sock
                 - --leader-election
@@ -379,13 +383,26 @@ data:
               volumeMounts:
                 - mountPath: /var/run/shared-tmpfs
                   name: shared-tmpfs
+            - name: snapshot-controller
+              image: registry.k8s.io/sig-storage/snapshot-controller:v6.2.0
+              args:
+                - --leader-election
+              imagePullPolicy: "IfNotPresent"
+              volumeMounts:
+                - mountPath: /var/run/shared-tmpfs
+                  name: shared-tmpfs
+            - name: csi-snapshotter
+              image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.0
+              args:
+                - --csi-address=/var/run/shared-tmpfs/csi.sock
+                - --leader-election
             - name: oci-csi-controller-driver
               args:
                 - --endpoint=unix://var/run/shared-tmpfs/csi.sock
                 - --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
               command:
                 - /usr/local/bin/oci-csi-controller-driver
-              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
               imagePullPolicy: IfNotPresent
               volumeMounts:
                 - name: config
@@ -536,7 +553,7 @@ data:
                       fieldPath: spec.nodeName
                 - name: PATH
                   value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
-              image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
+              image: ghcr.io/oracle/cloud-provider-oci:v1.28.0
               securityContext:
                 privileged: true
               volumeMounts:
@@ -551,6 +568,7 @@ data:
                   name: device-dir
                 - mountPath: /host
                   name: host-root
+                  mountPropagation: HostToContainer
                 - mountPath: /sbin/iscsiadm
                   name: chroot-iscsiadm
                   subPath: iscsiadm
@@ -570,7 +588,7 @@ data:
               args:
                 - --csi-address=/csi/csi.sock
                 - --kubelet-registration-path=/var/lib/kubelet/plugins/blockvolume.csi.oraclecloud.com/csi.sock
-              image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
+              image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
               securityContext:
                 privileged: true
               lifecycle:
@@ -589,7 +607,7 @@ data:
               args:
                 - --csi-address=/fss/csi.sock
                 - --kubelet-registration-path=/var/lib/kubelet/plugins/fss.csi.oraclecloud.com/csi.sock
-              image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
+              image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
               securityContext:
                 privileged: true
               lifecycle:
@@ -669,36 +687,36 @@ data:
       name: csi-oci
       namespace: kube-system
     rules:
-      - apiGroups: [ "" ]
-        resources: [ "events" ]
-        verbs: [ "get", "list", "watch", "create", "update", "patch" ]
-      - apiGroups: [ "" ]
-        resources: [ "nodes" ]
-        verbs: [ "get", "list", "watch" ]
-      - apiGroups: [ "volume.oci.oracle.com" ]
-        resources: [ "blockscsiinfos" ]
-        verbs: [ "get", "list", "watch", "create", "delete", "update", "patch" ]
-      - apiGroups: [ "" ]
-        resources: [ "persistentvolumes" ]
-        verbs: [ "get", "list", "watch", "create", "delete", "patch" ]
-      - apiGroups: [ "" ]
-        resources: [ "persistentvolumeclaims" ]
-        verbs: [ "get", "list", "watch", "update", "create" ]
-      - apiGroups: [ "storage.k8s.io" ]
-        resources: [ "storageclasses", "volumeattachments", "volumeattachments/status", "csinodes" ]
-        verbs: [ "get", "list", "watch", "patch" ]
-      - apiGroups: [ "coordination.k8s.io" ]
-        resources: [ "leases" ]
-        verbs: [ "get", "list", "watch", "create", "delete", "update", "patch" ]
-      - apiGroups: [ "" ]
-        resources: [ "endpoints" ]
-        verbs: [ "get", "watch", "create", "update" ]
-      - apiGroups: [ "" ]
-        resources: [ "pods" ]
-        verbs: [ "get", "list", "watch" ]
-      - apiGroups: [ "" ]
-        resources: [ "persistentvolumeclaims/status" ]
-        verbs: [ "patch" ]
+     - apiGroups: [ "" ]
+       resources: [ "events" ]
+       verbs: [ "get", "list", "watch", "create", "update", "patch" ]
+     - apiGroups: [ "" ]
+       resources: [ "nodes" ]
+       verbs: [ "get", "list", "watch" ]
+     - apiGroups: [ "volume.oci.oracle.com" ]
+       resources: [ "blockscsiinfos" ]
+       verbs: [ "get", "list", "watch", "create", "delete", "update", "patch" ]
+     - apiGroups: [ "" ]
+       resources: [ "persistentvolumes" ]
+       verbs: [ "get", "list", "watch", "create", "delete", "patch" ]
+     - apiGroups: [ "" ]
+       resources: [ "persistentvolumeclaims" ]
+       verbs: [ "get", "list", "watch", "update", "create" ]
+     - apiGroups: [ "storage.k8s.io" ]
+       resources: [ "storageclasses", "volumeattachments", "volumeattachments/status", "csinodes" ]
+       verbs: [ "get", "list", "watch", "patch" ]
+     - apiGroups: [ "coordination.k8s.io" ]
+       resources: [ "leases" ]
+       verbs: [ "get", "list", "watch", "create", "delete", "update", "patch" ]
+     - apiGroups: [ "" ]
+       resources: [ "endpoints" ]
+       verbs: [ "get", "watch", "create", "update" ]
+     - apiGroups: [ "" ]
+       resources: [ "pods" ]    
+       verbs: [ "get", "list", "watch" ]
+     - apiGroups: [ "" ]
+       resources: [ "persistentvolumeclaims/status" ]
+       verbs: [ "patch" ]
     ---
     
     kind: ClusterRoleBinding
diff --git a/test/e2e/data/shared/v1beta1/metadata.yaml b/test/e2e/data/shared/v1beta1/metadata.yaml
index 4a1df451..46725596 100644
--- a/test/e2e/data/shared/v1beta1/metadata.yaml
+++ b/test/e2e/data/shared/v1beta1/metadata.yaml
@@ -2,5 +2,5 @@ apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 kind: Metadata
 releaseSeries:
   - major: 1
-    minor: 4
+    minor: 5
     contract: v1beta1