diff --git a/templates/configmap.yaml b/templates/configmap.yaml
index 627f8b9..bd5f9b9 100644
--- a/templates/configmap.yaml
+++ b/templates/configmap.yaml
@@ -42,10 +42,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: aai-auth-secret
+  name: aai-auth-truststore-secret
   namespace: {{ include "common.namespace" . }}
 type: Opaque
 data:
-{{ tpl (.Files.Glob "resources/config/aai/aai_keystore").AsSecrets . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/aai/*").AsSecrets . | indent 2 }}
 
 
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 84f6997..dc65cef 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -31,6 +31,8 @@
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
       name: {{ .Release.Name }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
     spec:
       initContainers:
       - command: