diff --git a/.github/configs/external-redis.yaml b/.github/configs/external-redis.yaml
new file mode 100644
index 000000000..100e25de2
--- /dev/null
+++ b/.github/configs/external-redis.yaml
@@ -0,0 +1,66 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    app: external-redis
+  name: redis
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: external-redis
+  name: redis
+  namespace: redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: external-redis
+  template:
+    metadata:
+      labels:
+        app: external-redis
+    spec:
+      containers:
+      - args:
+        - --save
+        - ""
+        - --appendonly
+        - "no"
+        - --requirepass argocd
+        image: ecr-public.aws.com/docker/library/redis:7.2.8-alpine
+        name: redis
+        ports:
+        - containerPort: 6379
+          name: redis
+          protocol: TCP
+        resources: {}
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 999
+        seccompProfile:
+          type: RuntimeDefault
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: external-redis
+  name: redis
+  namespace: redis
+spec:
+  ports:
+  - name: redis
+    port: 6379
+    protocol: TCP
+    targetPort: redis
+  selector:
+    app: external-redis
+  type: ClusterIP
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
index dba4073ff..9b56b93f4 100644
--- a/.github/workflows/lint-and-test.yml
+++ b/.github/workflows/lint-and-test.yml
@@ -92,9 +92,7 @@ jobs:
       - name: Create an external redis for ArgoCD externalRedis feature
         if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
         run: |
-          kubectl create namespace redis
-          helm repo add bitnami https://charts.bitnami.com/bitnami
-          helm install redis bitnami/redis --wait --namespace redis --set auth.password=argocd --set architecture=standalone
+          kubectl apply -f ./.github/configs/external-redis.yaml
 
       - name: Run chart-testing (install)
         run: ct install --config ./.github/configs/ct-install.yaml
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 27254b512..b4e3c0381 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v3.1.5
 kubeVersion: ">=1.25.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 8.5.0
+version: 8.5.1
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -27,4 +27,4 @@ annotations:
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: changed
-      description: Add size limit for emptyDir in statefulset of argocd-application-controller
+      description: Replace Bitnami dependency used to automatically test this chart
diff --git a/charts/argo-cd/ci/external-redis-values.yaml b/charts/argo-cd/ci/external-redis-values.yaml
index 74409b78d..43e2aee93 100644
--- a/charts/argo-cd/ci/external-redis-values.yaml
+++ b/charts/argo-cd/ci/external-redis-values.yaml
@@ -8,5 +8,5 @@ redis-ha:
   enabled: false
 
 externalRedis:
-  host: "redis-master.redis.svc.cluster.local"
+  host: "external-redis.redis.svc.cluster.local"
   password: "argocd"