diff --git a/Dockerfile b/Dockerfile
index 6ccb012..8ca7a6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,4 +41,4 @@ ADD sa2kubeconfig.sh /usr/local/bin/sa2kubeconfig.sh
 USER ${ARGOCD_USER_ID}
 
 RUN helm plugin install --version ${HELM_SECRETS_VERSION} https://github.com/jkroepke/helm-secrets
-RUN sed -i -e 's/secrets/secrets --evaluate-templates/' "$(helm env HELM_PLUGINS)/helm-secrets/scripts/wrapper/helm.sh"
+RUN mkdir -p /home/argocd/.kube && sed -i -e 's/secrets/secrets --evaluate-templates/' "$(helm env HELM_PLUGINS)/helm-secrets/scripts/wrapper/helm.sh"
diff --git a/sa2kubeconfig.sh b/sa2kubeconfig.sh
index 48fbf53..56a5a41 100755
--- a/sa2kubeconfig.sh
+++ b/sa2kubeconfig.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-SA_NAME=argocd-repo-server
+SA_NAME=$ARGOCD_REPO_SERVER_NAME
 
 CA64=$(cat /run/secrets/kubernetes.io/serviceaccount/ca.crt | base64 -w0)
 TOKEN=$(cat /run/secrets/kubernetes.io/serviceaccount/token)