diff --git a/.github/tests/extras/values.yaml b/.github/tests/extras/values.yaml
index 274bc39..41a416e 100644
--- a/.github/tests/extras/values.yaml
+++ b/.github/tests/extras/values.yaml
@@ -1,7 +1,7 @@
 spire-agent:
   initContainers:
   - name: extra-init
-    image: busybox
+    image: cgr.dev/chainguard/busybox:latest-glibc
     command:
     - sh
     - -xec
@@ -12,7 +12,7 @@ spire-agent:
       mountPath: /extra
   extraContainers:
   - name: extra
-    image: busybox
+    image: cgr.dev/chainguard/busybox:latest-glibc
     command:
     - sh
     - -xec
@@ -32,7 +32,7 @@ spire-agent:
 spire-server:
   initContainers:
   - name: extra-init
-    image: busybox
+    image: cgr.dev/chainguard/busybox:latest-glibc
     command:
     - sh
     - -xec
@@ -43,7 +43,7 @@ spire-server:
       mountPath: /extra
   extraContainers:
   - name: extra
-    image: busybox
+    image: cgr.dev/chainguard/busybox:latest-glibc
     command:
     - sh
     - -xec
diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/tests/test-connection.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/tests/test-connection.yaml
index 70ab843..ab04d40 100644
--- a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/tests/test-connection.yaml
+++ b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/tests/test-connection.yaml
@@ -12,26 +12,26 @@ spec:
     {{- toYaml .Values.podSecurityContext | nindent 4 }}
   containers:
     - name: wget-service-name
-      image: busybox
+      image: cgr.dev/chainguard/bash:latest
       command: ['wget']
       args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}:{{ .Values.service.port }}/.well-known/openid-configuration']
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
     - name: wget-service-name-namespace
-      image: busybox
+      image: cgr.dev/chainguard/bash:latest
       command: ['wget']
       args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}.{{ include "spiffe-oidc-discovery-provider.namespace" . }}:{{ .Values.service.port }}/.well-known/openid-configuration']
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
     - name: wget-service-name-namespace-svc-cluster-local
-      image: busybox
+      image: cgr.dev/chainguard/bash:latest
       command: ['wget']
       args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}.{{ include "spiffe-oidc-discovery-provider.namespace" . }}.svc.cluster.local:{{ .Values.service.port }}/.well-known/openid-configuration']
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
     {{- if .Values.ingress.enabled }}
     - name: wget-ingress
-      image: busybox
+      image: cgr.dev/chainguard/bash:latest
       command: ['wget']
       args: ['-O', '/dev/null', '{{ index .Values.config.domains 0 }}/.well-known/openid-configuration']
       securityContext:
diff --git a/charts/spire/charts/spire-server/templates/tests/test-connection.yaml b/charts/spire/charts/spire-server/templates/tests/test-connection.yaml
index 4daa47d..0293420 100644
--- a/charts/spire/charts/spire-server/templates/tests/test-connection.yaml
+++ b/charts/spire/charts/spire-server/templates/tests/test-connection.yaml
@@ -11,17 +11,17 @@ spec:
   securityContext:
     {{- toYaml .Values.podSecurityContext | nindent 4 }}
   containers:
-    - name: wget
-      image: busybox
+    - name: netcat
+      image: cgr.dev/chainguard/bash:latest
       command: ['nc']
       args: ['-zvw3', '{{ include "spire-server.fullname" . }}', '{{ .Values.service.port }}']
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
     {{- if eq (.Values.federation.enabled | toString) "true" }}
-    - name: wget-federation-bundle-endpoint
-      image: busybox
-      command: ['wget']
-      args: ['--no-check-certificate', '-O', '/dev/null', 'https://{{ include "spire-server.fullname" . }}.{{ include "spire-server.namespace" . }}.svc.cluster.local:{{ .Values.federation.bundleEndpoint.port }}']
+    - name: curl-federation-bundle-endpoint
+      image: cgr.dev/chainguard/bash:latest
+      command: ['curl']
+      args: ['-k', '-s', '-f', 'https://{{ include "spire-server.fullname" . }}.{{ include "spire-server.namespace" . }}.svc.cluster.local:{{ .Values.federation.bundleEndpoint.port }}']
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
     {{- end }}