diff --git a/nuclei-templates/saml-headless.yaml b/nuclei-templates/saml-headless-all.yaml
similarity index 80%
rename from nuclei-templates/saml-headless.yaml
rename to nuclei-templates/saml-headless-all.yaml
index 649a7f549fae7d69b33e831e68462ed412bd5fde..7332a7ffa77db5ebb09a483e8b86ee3348ef2c81 100644
--- a/nuclei-templates/saml-headless.yaml
+++ b/nuclei-templates/saml-headless-all.yaml
@@ -6,7 +6,7 @@ info:
   tags: saml,headless
 variables:
   AUTHORIZATION: "Bearer abcd...789"
-  CONFORMANCE_IDP_HOSTNAME: conformance-idp.maiv1.incubator.geant.org
+  CONFORMANCE_IDP_BASE_URL: https://conformance-idp.maiv1.incubator.geant.org/
   RESULT_OUTPUT_DIR: ""
   FILENAME: '{{date_time("%Y-%M-%D_%H-%m-%s")}}-{{replace_regex(BaseURL,"(\\W+)","_")}}'
   TEST_CASES:
@@ -33,11 +33,11 @@ headless:
         value: "{{AUTHORIZATION}}"
     - action: navigate
       args:
-        url: "https://{{CONFORMANCE_IDP_HOSTNAME}}/module.php/conformance/test/setup?testId={{url_encode(TEST_CASE)}}&spEntityId={{url_encode(SP_ENTITY_ID)}}"
+        url: "{{trim_suffix(CONFORMANCE_IDP_BASE_URL, '/')}}/module.php/conformance/test/setup?testId={{url_encode(TEST_CASE)}}&spEntityId={{url_encode(SP_ENTITY_ID)}}"
     - action: waitload
     - action: navigate
       args:
-        url: "https://{{CONFORMANCE_IDP_HOSTNAME}}/saml2/idp/SSOService.php?spentityid={{url_encode(SP_ENTITY_ID)}}&ConsumerURL={{url_encode(BaseURL)}}"
+        url: "{{trim_suffix(CONFORMANCE_IDP_BASE_URL, '/')}}/saml2/idp/SSOService.php?spentityid={{url_encode(SP_ENTITY_ID)}}&ConsumerURL={{url_encode(BaseURL)}}"
     - action: waitload
     - action: screenshot
       args:
diff --git a/nuclei-templates/saml-raw.yaml b/nuclei-templates/saml-raw-all.yaml
similarity index 86%
rename from nuclei-templates/saml-raw.yaml
rename to nuclei-templates/saml-raw-all.yaml
index 3393d5147afc19c130d707d043f1c2d9826a8b31..aa83b71fbee06db637fe777a9d2c6a72aff351a4 100644
--- a/nuclei-templates/saml-raw.yaml
+++ b/nuclei-templates/saml-raw-all.yaml
@@ -6,7 +6,8 @@ info:
   tags: saml,raw
 variables:
   AUTHORIZATION: "Bearer abcd...789"
-  CONFORMANCE_IDP_HOSTNAME: conformance-idp.maiv1.incubator.geant.org
+  CONFORMANCE_IDP_BASE_URL: https://conformance-idp.maiv1.incubator.geant.org/
+  CONFORMANCE_IDP_HOSTNAME: '{{replace_regex(CONFORMANCE_IDP_BASE_URL, "^https?://|/.*$", "")}}'
   TEST_CASES:
     - noSignature
     - invalidSignature
@@ -52,9 +53,9 @@ http:
   # HTTP-POST binding
   - raw:
       - |
-        @Host: {{replace_regex(trim_prefix(trim(acs,"[]"), "https://"), "/.*", "")}}
+        @Host: {{replace_regex(trim(acs,"[]"), "^https?://|/.*$", "")}}
         POST {{trim(acs,"[]")}} HTTP/1.1
-        Host: {{replace_regex(trim_prefix(trim(acs,"[]"), "https://"), "/.*", "")}}
+        Host: {{replace_regex(trim(acs,"[]"), "^https?://|/.*$", "")}}
         Content-Type: application/x-www-form-urlencoded
 
         SAMLResponse={{url_encode(trim(samlresponse,"[]"))}}