diff --git a/templates/gitea/config.yaml b/templates/gitea/config.yaml
index 31488a5..68df5f8 100644
--- a/templates/gitea/config.yaml
+++ b/templates/gitea/config.yaml
@@ -25,9 +25,9 @@ stringData:
     
     {{- /* multiple replicas assertions */ -}}
     {{- if gt .Values.replicaCount 1.0 -}}
-      {{- if $.Values.gitea.config.cron -}}
-        {{- if $.Values.gitea.config.cron.GIT_GC_REPOS -}}
-          {{- if eq $.Values.gitea.config.cron.GIT_GC_REPOS.ENABLED true -}}
+      {{- if .Values.gitea.config.cron -}}
+        {{- if .Values.gitea.config.cron.GIT_GC_REPOS -}}
+          {{- if eq .Values.gitea.config.cron.GIT_GC_REPOS.ENABLED true -}}
             {{ fail "Invoking the garbage collector via CRON is not yet supported when running with multiple replicas. Please set 'cron.GIT_GC_REPOS.enabled = false'." }}
           {{- end }}
         {{- end }}
@@ -36,14 +36,14 @@ stringData:
       {{- if eq (first .Values.persistence.accessModes) "ReadWriteOnce" -}}
         {{- fail "When using multiple replicas, a RWX file system is required and gitea.persistence.accessModes[0] must be set to ReadWriteMany." -}}
       {{- end }}
-      {{- if $.Values.gitea.config.indexer -}}
-        {{- if eq (get .Values.gitea.config.indexer "ISSUE_INDEXER_TYPE") "bleve" -}}
+      {{- if .Values.gitea.config.indexer -}}
+        {{- if eq .Values.gitea.config.indexer.ISSUE_INDEXER_TYPE "bleve" -}}
           {{- fail "When using multiple replicas, the issue indexer (gitea.config.indexer.ISSUE_INDEXER_TYPE) must be set to a HA-ready provider such as 'meilisearch', 'elasticsearch' or 'db' (if the DB is HA-ready)." -}}
         {{- end }}
         {{- if .Values.gitea.config.indexer.REPO_INDEXER_TYPE -}}
-          {{- if eq (get .Values.gitea.config.indexer "REPO_INDEXER_TYPE") "bleve" -}}
+          {{- if eq .Values.gitea.config.indexer.REPO_INDEXER_TYPE "bleve" -}}
             {{- if .Values.gitea.config.indexer.REPO_INDEXER_ENABLED -}}
-              {{- if eq (get .Values.gitea.config.indexer "REPO_INDEXER_ENABLED") "true" -}}
+              {{- if eq .Values.gitea.config.indexer.REPO_INDEXER_ENABLED true -}}
                 {{- fail "When using multiple replicas, the repo indexer (gitea.config.indexer.REPO_INDEXER_TYPE) must be set to 'meilisearch' or 'elasticsearch' or disabled." -}}
               {{- end }}
             {{- end }}
diff --git a/unittests/deployment/HA.yaml b/unittests/deployment/HA.yaml
index 14280bd..1108588 100644
--- a/unittests/deployment/HA.yaml
+++ b/unittests/deployment/HA.yaml
@@ -52,8 +52,8 @@ tests:
       gitea:
         config:
           indexer:
-            ISSUE_INDEXER_TYPE: bleve
+            REPO_INDEXER_TYPE: bleve
             REPO_INDEXER_ENABLED: true
     asserts:
       - failedTemplate:
-          errorMessage: "When using multiple replicas, the issue indexer (gitea.config.indexer.ISSUE_INDEXER_TYPE) must be set to a HA-ready provider such as 'meilisearch', 'elasticsearch' or 'db' (if the DB is HA-ready)."
\ No newline at end of file
+          errorMessage: "When using multiple replicas, the repo indexer (gitea.config.indexer.REPO_INDEXER_TYPE) must be set to 'meilisearch' or 'elasticsearch' or disabled."