diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 5b4ee105..a73dd08f 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -1,5 +1,4 @@
 {{- $redisHa := (index .Values "redis-ha") -}}
-{{- $containerSecurityContext := .Values.repoServer.containerSecurityContext | default dict }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -83,10 +82,8 @@ spec:
         {{- if .Values.repoServer.volumeMounts }}
 {{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
         {{- end }}
-        {{- if or .Values.openshift.enabled $containerSecurityContext.readOnlyRootFilesystem }}
         - mountPath: /app/config/gpg/keys
           name: gpg-keyring
-        {{- end }}
         {{- if .Values.configs.knownHosts }}
         - mountPath: /app/config/ssh
           name: ssh-known-hosts
@@ -95,10 +92,8 @@ spec:
         - mountPath: /app/config/tls
           name: tls-certs
         {{- end }}
-        {{- if $containerSecurityContext.readOnlyRootFilesystem }}
         - mountPath: /tmp
           name: tmp-dir
-        {{- end }}
         ports:
         - name: repo-server
           containerPort: {{ .Values.repoServer.containerPort }}
@@ -147,10 +142,8 @@ spec:
       {{- if .Values.repoServer.volumes }}
 {{- toYaml .Values.repoServer.volumes | nindent 6}}
       {{- end }}
-      {{- if or .Values.openshift.enabled $containerSecurityContext.readOnlyRootFilesystem }}
       - emptyDir: {}
         name: gpg-keyring
-      {{- end }}
       {{- if .Values.configs.knownHosts }}
       - configMap:
           name: argocd-ssh-known-hosts-cm
@@ -161,10 +154,8 @@ spec:
           name: argocd-tls-certs-cm
         name: tls-certs
       {{- end }}
-      {{- if $containerSecurityContext.readOnlyRootFilesystem }}
       - emptyDir: {}
         name: tmp-dir
-      {{- end }}
       {{- if .Values.repoServer.initContainers }}
       initContainers:
 {{- toYaml .Values.repoServer.initContainers | nindent 6 }}