diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 5fc96c62..bfdc1fa6 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -17,6 +17,11 @@ jobs:
         run: |
           cd build-tools
           ./build_components.sh
+      - name: Build CSI plugins
+        shell: bash
+        run: |
+          cd build-tools
+          ./build_csi_plugins.sh
       - name: Make Datashim manifests
         run: make manifests
       - name: Update manifests to use local images
@@ -38,6 +43,8 @@ jobs:
         run: |
           kind load docker-image -n chart-testing quay.io/datashim-io/dataset-operator:latest
           kind load docker-image -n chart-testing quay.io/datashim-io/generate-keys:latest
+          kind load docker-image -n chart-testing quay.io/datashim-io/csi-s3:latest
+          kind load docker-image -n chart-testing quay.io/datashim-io/csi-nfs:latest
       - name: Install Datashim
         run: make deployment
       - name: Wait for Datashim
diff --git a/build-tools/Makefile b/build-tools/Makefile
index d45c8162..63b64e0d 100644
--- a/build-tools/Makefile
+++ b/build-tools/Makefile
@@ -4,9 +4,9 @@ ARCH ?= $(shell go env GOARCH)
 
 #used only when building the plugins
 
-EXTERNAL_ATTACHER_TAG ?= v3.3.0
-EXTERNAL_PROVISIONER_TAG ?= v2.2.2
-NODE_DRIVER_REGISTRAR_TAG ?= v2.3.0
+EXTERNAL_ATTACHER_TAG ?= v4.7.0
+EXTERNAL_PROVISIONER_TAG ?= v5.1.0
+NODE_DRIVER_REGISTRAR_TAG ?= v2.12.0
 
 include helpers.mk
 
diff --git a/release-tools/manifests/dlf-ibm-k8s.yaml b/release-tools/manifests/dlf-ibm-k8s.yaml
index 1a4691a7..bc18dc08 100644
--- a/release-tools/manifests/dlf-ibm-k8s.yaml
+++ b/release-tools/manifests/dlf-ibm-k8s.yaml
@@ -958,7 +958,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0"
+          image: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0"
           lifecycle:
             preStop:
               exec:
@@ -1046,7 +1046,7 @@ spec:
       serviceAccountName: csi-s3
       containers:
         - name: driver-registrar
-          image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0"
+          image: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0"
           imagePullPolicy: Always
           args:
             - --v=5
@@ -1239,7 +1239,7 @@ spec:
       serviceAccountName: csi-attacher-nfs
       containers:
         - name: csi-attacher
-          image: "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0"
+          image: "registry.k8s.io/sig-storage/csi-attacher:v4.7.0"
           args:
             - "--v=10"
             - "--csi-address=$(ADDRESS)"
@@ -1303,7 +1303,7 @@ spec:
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
-          image: "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0"
+          image: "registry.k8s.io/sig-storage/csi-attacher:v4.7.0"
           imagePullPolicy: Always
           args:
             - --v=5
@@ -1350,7 +1350,7 @@ spec:
       serviceAccountName: csi-provisioner
       containers:
         - name: csi-provisioner
-          image: "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2"
+          image: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"
           imagePullPolicy: Always
           args:
             - -v=5
diff --git a/release-tools/manifests/dlf-ibm-oc.yaml b/release-tools/manifests/dlf-ibm-oc.yaml
index 6f58cb3a..064bcafd 100644
--- a/release-tools/manifests/dlf-ibm-oc.yaml
+++ b/release-tools/manifests/dlf-ibm-oc.yaml
@@ -958,7 +958,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0"
+          image: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0"
           lifecycle:
             preStop:
               exec:
@@ -1046,7 +1046,7 @@ spec:
       serviceAccountName: csi-s3
       containers:
         - name: driver-registrar
-          image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0"
+          image: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0"
           imagePullPolicy: Always
           args:
             - --v=5
@@ -1239,7 +1239,7 @@ spec:
       serviceAccountName: csi-attacher-nfs
       containers:
         - name: csi-attacher
-          image: "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0"
+          image: "registry.k8s.io/sig-storage/csi-attacher:v4.7.0"
           args:
             - "--v=10"
             - "--csi-address=$(ADDRESS)"
@@ -1303,7 +1303,7 @@ spec:
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
-          image: "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0"
+          image: "registry.k8s.io/sig-storage/csi-attacher:v4.7.0"
           imagePullPolicy: Always
           args:
             - --v=5
@@ -1350,7 +1350,7 @@ spec:
       serviceAccountName: csi-provisioner
       containers:
         - name: csi-provisioner
-          image: "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2"
+          image: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"
           imagePullPolicy: Always
           args:
             - -v=5
diff --git a/release-tools/manifests/dlf-oc.yaml b/release-tools/manifests/dlf-oc.yaml
index 9d16af22..f177eaa1 100644
--- a/release-tools/manifests/dlf-oc.yaml
+++ b/release-tools/manifests/dlf-oc.yaml
@@ -958,7 +958,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0"
+          image: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0"
           lifecycle:
             preStop:
               exec:
@@ -1046,7 +1046,7 @@ spec:
       serviceAccountName: csi-s3
       containers:
         - name: driver-registrar
-          image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0"
+          image: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0"
           imagePullPolicy: Always
           args:
             - --v=5
@@ -1239,7 +1239,7 @@ spec:
       serviceAccountName: csi-attacher-nfs
       containers:
         - name: csi-attacher
-          image: "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0"
+          image: "registry.k8s.io/sig-storage/csi-attacher:v4.7.0"
           args:
             - "--v=10"
             - "--csi-address=$(ADDRESS)"
@@ -1303,7 +1303,7 @@ spec:
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
-          image: "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0"
+          image: "registry.k8s.io/sig-storage/csi-attacher:v4.7.0"
           imagePullPolicy: Always
           args:
             - --v=5
@@ -1350,7 +1350,7 @@ spec:
       serviceAccountName: csi-provisioner
       containers:
         - name: csi-provisioner
-          image: "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2"
+          image: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"
           imagePullPolicy: Always
           args:
             - -v=5
diff --git a/release-tools/manifests/dlf.yaml b/release-tools/manifests/dlf.yaml
index aee697e2..16811187 100644
--- a/release-tools/manifests/dlf.yaml
+++ b/release-tools/manifests/dlf.yaml
@@ -958,7 +958,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0"
+          image: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0"
           lifecycle:
             preStop:
               exec:
@@ -1046,7 +1046,7 @@ spec:
       serviceAccountName: csi-s3
       containers:
         - name: driver-registrar
-          image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0"
+          image: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0"
           imagePullPolicy: Always
           args:
             - --v=5
@@ -1239,7 +1239,7 @@ spec:
       serviceAccountName: csi-attacher-nfs
       containers:
         - name: csi-attacher
-          image: "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0"
+          image: "registry.k8s.io/sig-storage/csi-attacher:v4.7.0"
           args:
             - "--v=10"
             - "--csi-address=$(ADDRESS)"
@@ -1303,7 +1303,7 @@ spec:
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
-          image: "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0"
+          image: "registry.k8s.io/sig-storage/csi-attacher:v4.7.0"
           imagePullPolicy: Always
           args:
             - --v=5
@@ -1350,7 +1350,7 @@ spec:
       serviceAccountName: csi-provisioner
       containers:
         - name: csi-provisioner
-          image: "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2"
+          image: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"
           imagePullPolicy: Always
           args:
             - -v=5