diff --git a/tasks/hydra-saml.yml b/tasks/hydra-saml.yml
index 6a8ca43..ed6a378 100644
--- a/tasks/hydra-saml.yml
+++ b/tasks/hydra-saml.yml
@@ -59,4 +59,4 @@
       mode: u=rw,g=r,o=r
   notify:
     - Restart cadoles-pod-shibboleth-sp-v3
-  become: true
\ No newline at end of file
+  become: true
diff --git a/templates/cadoles-pod-shibboleth-sp-v3.conf.j2 b/templates/cadoles-pod-shibboleth-sp-v3.conf.j2
index f11a7b9..52bed08 100644
--- a/templates/cadoles-pod-shibboleth-sp-v3.conf.j2
+++ b/templates/cadoles-pod-shibboleth-sp-v3.conf.j2
@@ -4,7 +4,7 @@ PODMAN_ARGS="\
     --network=slirp4netns:allow_host_loopback=true \
     --replace --name 'cadoles-pod-shibboleth-sp-v3' \
     --tz=local \
-    -e 'SP_ENTITY_ID={{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}' \
+    -e 'SP_ENTITY_ID={{ ansible_hostname }}{{ haproxy_hydra_saml_base_path }}' \
     -e 'SP_LOG_LEVEL={{ hydra_saml_sp_log_level }}' \
     -e 'IDP_ENTITY_ID={{ hydra_saml_idp_entity_id }}' \
     -e 'IDP_METADATA_URL={{ hydra_saml_idp_metadata_url }}' \
@@ -18,4 +18,4 @@ PODMAN_ARGS="\
     -v '/etc/shibboleth/attribute-map.inc.xml:/etc/shibboleth/attribute-map.inc.xml' \
     -v '/etc/shibboleth/attribute-policy.inc.xml:/etc/shibboleth/attribute-policy.inc.xml' \
     -v '/etc/shibboleth/credentials:/etc/shibboleth/credentials' \
-"
\ No newline at end of file
+"