diff --git a/charts/aserto-lib/templates/_config.tpl b/charts/aserto-lib/templates/_config.tpl
index 3acd2bd..eb36932 100644
--- a/charts/aserto-lib/templates/_config.tpl
+++ b/charts/aserto-lib/templates/_config.tpl
@@ -1,9 +1,11 @@
 {{- define "aserto-lib.controllerClientCfg" }}
-{{- include "aserto-lib.mergeGlobal" (list . "controller") }}
+{{- include "aserto-lib.mergeGlobal" (list . "controller") | fromYaml |
+	merge (dict "apiKeysSecret" "controller-keys") }}
 {{- end }}
 
 {{- define "aserto-lib.directoryClientCfg" }}
-{{- include "aserto-lib.mergeGlobal" (list . "directory") }}
+{{- include "aserto-lib.mergeGlobal" (list . "directory") | fromYaml |
+	merge (dict "apiKeysSecret" "directory-keys") }}
 {{- end }}
 
 {{- define "aserto-lib.discoveryCfg" }}
@@ -31,41 +33,41 @@ valueFrom:
 
 
 {{- define "aserto-lib.controllerReadKeyEnv" -}}
-{{- with include "aserto-lib.controllerClientCfg" . | fromYaml | default dict -}}
+{{- with include "aserto-lib.controllerClientCfg" . | fromYaml -}}
 {{ include "aserto-lib.dsApiKeyEnv" (list . "read" "controller-keys") }}
 {{- end }}
 {{- end }}
 
 
 {{- define "aserto-lib.controllerWriteKeyEnv" -}}
-{{- with include "aserto-lib.controllerClientCfg" . | fromYaml | default dict -}}
+{{- with include "aserto-lib.controllerClientCfg" . | fromYaml -}}
 {{ include "aserto-lib.dsApiKeyEnv" (list . "write" "controller-keys") }}
 {{- end }}
 {{- end }}
 
 
 {{- define "aserto-lib.controllerStoreKeyEnv" -}}
-{{- with include "aserto-lib.controllerClientCfg" . | fromYaml | default dict -}}
+{{- with include "aserto-lib.controllerClientCfg" . | fromYaml -}}
 {{ include "aserto-lib.dsApiKeyEnv" (list . "store" "controller-keys") }}
 {{- end }}
 {{- end }}
 
 {{- define "aserto-lib.directoryReadKeyEnv" -}}
-{{- with include "aserto-lib.directoryClientCfg" . | fromYaml | default dict -}}
+{{- with include "aserto-lib.directoryClientCfg" . | fromYaml -}}
 {{ include "aserto-lib.dsApiKeyEnv" (list . "read" "directory-keys") }}
 {{- end }}
 {{- end }}
 
 
 {{- define "aserto-lib.directoryWriteKeyEnv" -}}
-{{- with include "aserto-lib.directoryClientCfg" . | fromYaml | default dict -}}
+{{- with include "aserto-lib.directoryClientCfg" . | fromYaml -}}
 {{ include "aserto-lib.dsApiKeyEnv" (list . "write" "directory-keys") }}
 {{- end }}
 {{- end }}
 
 
 {{- define "aserto-lib.directoryStoreKeyEnv" -}}
-{{- with include "aserto-lib.directoryClientCfg" . | fromYaml | default dict -}}
+{{- with include "aserto-lib.directoryClientCfg" . | fromYaml -}}
 {{ include "aserto-lib.dsApiKeyEnv" (list . "store" "directory-keys") }}
 {{- end }}
 {{- end }}
diff --git a/charts/directory/ci/minimal-values.yaml b/charts/directory/ci/minimal-values.yaml
index b6fd62e..d1bfc1f 100644
--- a/charts/directory/ci/minimal-values.yaml
+++ b/charts/directory/ci/minimal-values.yaml
@@ -5,8 +5,4 @@ global:
       - name: ghcr-creds
 
 database:
-  host: tenant-db-host
-
-sshAdminKeys:
-  keys: |
-    ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDf6
+  host: directory-postgres
diff --git a/charts/directory/test/no-tls.values.yaml b/charts/directory/test/no-tls.values.yaml
index 2b131fb..118f8bb 100644
--- a/charts/directory/test/no-tls.values.yaml
+++ b/charts/directory/test/no-tls.values.yaml
@@ -13,11 +13,3 @@ database:
     credentialsSecret: pg-credentials
   reader:
     credentialsSecret: pg-directory-reader-credentials
-
-cache:
-  sizeMB: 100
-
-sshAdminKeys:
-  configMap:
-    name: directory-admin-keys
-    key: authorized_keys
diff --git a/charts/directory/test/tests.yaml b/charts/directory/test/tests.yaml
index bea23d3..312d12a 100644
--- a/charts/directory/test/tests.yaml
+++ b/charts/directory/test/tests.yaml
@@ -29,7 +29,7 @@ tests:
     run:
       # Create a tenant.
       - |
-        ${GRPCURL:=grpcurl} -plaintext -H "Authorization: basic apikey_writer" \
+        ${GRPCURL:=grpcurl} -plaintext -H "Authorization: basic apikey_store" \
           -d '{"tenant": {"id": "3dbaa470-9c7e-11ef-bf36-00fcb2a75cb1", "name": "test-tenant"}}' \
           localhost:8282 aserto.directory.store.v2.Store.CreateTenant
 
@@ -49,7 +49,7 @@ tests:
     cleanup:
       # Delete tenant.
       - |
-        ${GRPCURL:=grpcurl} -plaintext -H "Authorization: basic apikey_writer" \
+        ${GRPCURL:=grpcurl} -plaintext -H "Authorization: basic apikey_store" \
           -d '{"id": "3dbaa470-9c7e-11ef-bf36-00fcb2a75cb1"}' \
           localhost:8282 aserto.directory.store.v2.Store.DeleteTenant
 
@@ -95,7 +95,7 @@ tests:
     run:
       # Create a tenant.
       - |
-        ${GRPCURL:=grpcurl} -insecure -H "Authorization: basic apikey_writer" \
+        ${GRPCURL:=grpcurl} -insecure -H "Authorization: basic apikey_store" \
           -d '{"tenant": {"id": "3dbaa470-9c7e-11ef-bf36-00fcb2a75cb1", "name": "test-tenant"}}' \
           localhost:8282 aserto.directory.store.v2.Store.CreateTenant
 
@@ -114,6 +114,6 @@ tests:
       - diff charts/directory/test/manifest.yaml $TMPDIR/manifest.yaml
     cleanup:
       - |
-        docker run --network="host" fullstorydev/grpcurl -insecure -H "Authorization: basic apikey_writer" \
+        ${GRPCURL:=grpcurl} -insecure -H "Authorization: basic apikey_store" \
           -d '{"id": "3dbaa470-9c7e-11ef-bf36-00fcb2a75cb1"}' \
           localhost:8282 aserto.directory.store.v2.Store.DeleteTenant
diff --git a/charts/directory/test/tls.values.yaml b/charts/directory/test/tls.values.yaml
index 35e6ab0..e0f5d8f 100644
--- a/charts/directory/test/tls.values.yaml
+++ b/charts/directory/test/tls.values.yaml
@@ -14,14 +14,6 @@ database:
   reader:
     credentialsSecret: pg-directory-reader-credentials
 
-cache:
-  sizeMB: 100
-
-sshAdminKeys:
-  configMap:
-    name: directory-admin-keys
-    key: authorized_keys
-
 grpc:
   certSecret: grpc-cert