diff --git a/el9/templates/deployment.yaml b/el9/templates/deployment.yaml
index f293d0b6132a84202c3c71c059f228874fa2987c..c30851537451be47dc952b08f90acf73440d8310 100644
--- a/el9/templates/deployment.yaml
+++ b/el9/templates/deployment.yaml
@@ -89,6 +89,9 @@ spec:
       dnsConfig:
         options:
         - name: single-request
+      # We are not using service-discovery based on environment variables
+      # https://kubernetes.io/docs/tutorials/services/connect-applications-service/#environment-variables
+      enableServiceLinks: false
       restartPolicy: Always
       serviceAccountName: {{ .Release.Name }}
       # We want to limit the permissions on directories mounted by the httpd container to not allow users
diff --git a/el9/values.yaml b/el9/values.yaml
index c41c37933acf247bd1a94e83bd6f60dbb23fdc1e..9efb3411b3947d28b43924b45f51c0260caf09dd 100644
--- a/el9/values.yaml
+++ b/el9/values.yaml
@@ -156,6 +156,8 @@ containers:
         - |
           # check that PHP-FPM is responding
           function check_php_fpm {
+            # "env -i" runs the command without extra environment variables
+            env -i \
             SCRIPT_NAME=/ping \
             SCRIPT_FILENAME=/ping \
             REQUEST_METHOD=GET \
@@ -175,6 +177,8 @@ containers:
         - |
           # check that PHP-FPM is responding
           function check_php_fpm {
+            # "env -i" runs the command without extra environment variables
+            env -i \
             SCRIPT_NAME=/ping \
             SCRIPT_FILENAME=/ping \
             REQUEST_METHOD=GET \