diff --git a/charmcraft.yaml b/charmcraft.yaml
index 57a2d51..9477a50 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -12,11 +12,13 @@ bases:
       - name: ubuntu
         channel: "20.04"
         architectures:
-        - "amd64"
+          - amd64
+          - arm64
       - name: ubuntu
         channel: "22.04"
-        architectures: 
-        - "amd64"
+        architectures:
+          - amd64
+          - arm64
 parts:
   charm:
     build-packages:
diff --git a/src/storage_manifests.py b/src/storage_manifests.py
index b61c1bd..8d792fe 100644
--- a/src/storage_manifests.py
+++ b/src/storage_manifests.py
@@ -105,7 +105,7 @@ def __init__(self, charm, charm_config, kube_control, integrator):
                 ConfigRegistry(self),
                 CreateStorageClass(self, "default"),  # creates csi-cinder-default
                 UpdateSecrets(self),  # update secrets
-                UpdateControllerPlugin,
+                UpdateControllerPlugin(self),
             ],
         )
         self.integrator = integrator
@@ -151,7 +151,6 @@ def __call__(self, obj):
         """Update the controller args in Deployments."""
         if not any(
             [
-                (obj.kind == "DaemonSet" and obj.metadata.name == "csi-cinder-nodeplugin"),
                 (obj.kind == "Deployment" and obj.metadata.name == "csi-cinder-controllerplugin"),
             ]
         ):
@@ -161,6 +160,6 @@ def __call__(self, obj):
             if container.name == "csi-provisioner":
                 for i, val in enumerate(container.args):
                     if "feature-gates" in val.lower():
-                        container.args[i] = f"feature-gates=Topology={self.manifests.config.get('topology')}"
-                log.info(f"Disabling cinder topology awareness")
-
+                        topology = str(self.manifests.config.get("topology")).lower()
+                        container.args[i] = f"feature-gates=Topology={topology}"
+                        log.info(f"Configuring cinder topology awareness=%s", topology)
\ No newline at end of file