diff --git a/swh-graphql/templates/ingress.yaml b/swh-graphql/templates/ingress.yaml
index a9bf188..715a8ff 100644
--- a/swh-graphql/templates/ingress.yaml
+++ b/swh-graphql/templates/ingress.yaml
@@ -1,24 +1,27 @@
 {{ if .Values.enableIngress }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   namespace: {{ .Values.namespace }}
-  name: graphql
+  name: graphql-ingress
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
   {{- if .Values.ingressClassName }}
   ingressClassName: {{ .Values.ingressClassName }}
   {{- end }}
   rules:
-  - host: {{ .Values.ingressHost }}
-    http:
+  - http:
       paths:
       - path: {{ .Values.ingressHttpPath }}
         pathType: Prefix
         backend:
           service:
             name: graphql
             port:
               number: 5013
+    {{- if .Values.ingressHost }}
+    host: {{ .Values.ingressHost }}
+    {{- end }}
+
 {{ end }}
diff --git a/swh-graphql/values/default.yaml b/swh-graphql/values/default.yaml
index 1df71cb..61b5dde 100644
--- a/swh-graphql/values/default.yaml
+++ b/swh-graphql/values/default.yaml
@@ -1,36 +1,36 @@
 # Default values for graphql.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 namespace: default
 
 # Number of graphql pods to deploy
 replicas: 1
 
 image:
   # The name of the image to use
   name: softwareheritage/graphql
   # The version of the image to use
   version: latest
   pullPolicy: Always
 
 # The storage url to query
 storageUrl: http://storage.svc.cluster.local:5002
 
 # Deploy or not an ingress controller
 enableIngress: true
 # Specify the ingress class to use if several are available in the cluster
 ingressClassName: {}
 
 # The ingress host to listen for
-ingressHost: graphql.localdomain
+ingressHost: ""
 
 # Configure the path of the ingress
 ingressHttpPath: /
 
 # The graphql log level. Possible values TRACE, DEBUG, INFO, ERROR
 logLevel: INFO
 
 gunicornThreads: 4
 gunicornWorkers: 2
 gunicornTimeout: 3600
diff --git a/swh-graphql/values/staging.yaml b/swh-graphql/values/staging.yaml
index 7d7c42d..a3570b6 100644
--- a/swh-graphql/values/staging.yaml
+++ b/swh-graphql/values/staging.yaml
@@ -1,15 +1,11 @@
 # namespace: graphql-rancher-cluster
 
 # The storage url to query
 storageUrl: http://webapp.internal.staging.swh.network:5002/
 
-# The ingress host to listen for
-ingressHost: graphql-worker0.internal.staging.swh.network
-# ingressHost: graphql.cluster
-
 # Configure the path of the ingress
 ingressHttpPath: /
 
 # The graphql log level. Possible values TRACE, DEBUG, INFO, ERROR
 logLevel: DEBUG