diff --git a/README.md b/README.md
index ec3b9f3..d7ee666 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ The compose file will create the following named volumes:
 
 ## Configuring the Cluster
 
-All config files in `slurm-cluster-chart/files` will be mounted into the container to configure their respective services on startup. The `authorized_keys` file contains authorised public keys for the user `rocky`, add your public key to access the cluster. Note that changes to these files will not be propagated to existing deployments (see Reconfiguring the Cluster).
+All config files in `slurm-cluster-chart/files` will be mounted into the container to configure their respective services on startup. The `authorized_keys` file contains authorised public keys for the user `rocky`, add your public key to access the cluster. Note that changes to these files will not all be propagated to existing deployments (see "Reconfiguring the Cluster").
 Additional parameters can be found in the `values.yaml` file, which will be applied on a Helm chart deployment. Note that some of these values, such as `encodedMungeKey` will also not propagate until the cluster is restarted (see Reconfiguring the Cluster).
 
 ## Deploying the Cluster
diff --git a/slurm-cluster-chart/templates/mysql-deployment.yaml b/slurm-cluster-chart/templates/mysql-deployment.yaml
index 2ffad17..b52a1e2 100644
--- a/slurm-cluster-chart/templates/mysql-deployment.yaml
+++ b/slurm-cluster-chart/templates/mysql-deployment.yaml
@@ -3,20 +3,23 @@ kind: Deployment
 metadata:
   creationTimestamp: null
   labels:
-    io.kompose.service: mysql
+    app.kubernetes.io/name: slurm
+    app.kubernetes.io/component: mysql
   name: mysql
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: mysql
+      app.kubernetes.io/name: slurm
+      app.kubernetes.io/component: mysql
   strategy:
     type: Recreate
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: mysql
+        app.kubernetes.io/name: slurm
+        app.kubernetes.io/component: mysql
     spec:
       containers:
         - env:
diff --git a/slurm-cluster-chart/templates/mysql-service.yaml b/slurm-cluster-chart/templates/mysql-service.yaml
index 466a634..5dd79f5 100644
--- a/slurm-cluster-chart/templates/mysql-service.yaml
+++ b/slurm-cluster-chart/templates/mysql-service.yaml
@@ -3,7 +3,8 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    io.kompose.service: mysql
+    app.kubernetes.io/name: slurm
+    app.kubernetes.io/component: mysql
   name: mysql
 spec:
   ports:
@@ -11,6 +12,7 @@ spec:
       port: 3306
       targetPort: 3306
   selector:
-    io.kompose.service: mysql
+    app.kubernetes.io/name: slurm
+    app.kubernetes.io/component: mysql
 status:
   loadBalancer: {}
diff --git a/slurm-cluster-chart/templates/slurm-jobdir-persistentvolumeclaim.yaml b/slurm-cluster-chart/templates/slurm-jobdir-persistentvolumeclaim.yaml
deleted file mode 100644
index 62f04f1..0000000
--- a/slurm-cluster-chart/templates/slurm-jobdir-persistentvolumeclaim.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: slurm-jobdir
-  name: slurm-jobdir
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .Values.sharedDirectory.storage }}
-status: {}
diff --git a/slurm-cluster-chart/templates/var-lib-mysql-persistentvolumeclaim.yaml b/slurm-cluster-chart/templates/var-lib-mysql-persistentvolumeclaim.yaml
index 5ef255e..373a801 100644
--- a/slurm-cluster-chart/templates/var-lib-mysql-persistentvolumeclaim.yaml
+++ b/slurm-cluster-chart/templates/var-lib-mysql-persistentvolumeclaim.yaml
@@ -3,7 +3,8 @@ kind: PersistentVolumeClaim
 metadata:
   creationTimestamp: null
   labels:
-    io.kompose.service: var-lib-mysql
+    app.kubernetes.io/name: slurm
+    app.kubernetes.io/component: mysql
   name: var-lib-mysql
 spec:
   accessModes: