diff --git a/README.md b/README.md
index d3e8cf5918665e6c01b43e93e19ec38b0643fda6..957edff907217eb29e6c0e770628e358a1220b0c 100644
--- a/README.md
+++ b/README.md
@@ -38,14 +38,14 @@ Then you need to connect SPs to the conformance IdP (exchange metadata), so that
 Run against one target:
 
 ```sh
-nuclei --headless -u ACS_URL_HERE -V "ENTITY_ID=ENTITY_ID_HERE" -V "AUTHORIZATION=AUTHORIZATION_HERE" \
+nuclei --headless -u ACS_URL_HERE -V "SP_ENTITY_ID=ENTITY_ID_HERE" -V "AUTHORIZATION=AUTHORIZATION_HERE" \
     -duc -ms -t nuclei-templates/ -nmhe -lna -dka 30 -dt 30
 ```
 
 or using docker:
 
 ```sh
-docker run --rm -v ./:/app/ projectdiscovery/nuclei --headless -u ACS_URL_HERE -V "ENTITY_ID=ENTITY_ID_HERE" -V "AUTHORIZATION=AUTHORIZATION_HERE" \
+docker run --rm -v ./:/app/ projectdiscovery/nuclei --headless -u ACS_URL_HERE -V "SP_ENTITY_ID=ENTITY_ID_HERE" -V "AUTHORIZATION=AUTHORIZATION_HERE" \
     -duc -ms -t /app/nuclei-templates/ -nmhe -lna -dka 30 -dt 30
 ```
 
diff --git a/nuclei-templates/saml-headless.yaml b/nuclei-templates/saml-headless.yaml
index 4cb596a2f578d7d4c66fdce444ab4a17e8128278..649a7f549fae7d69b33e831e68462ed412bd5fde 100644
--- a/nuclei-templates/saml-headless.yaml
+++ b/nuclei-templates/saml-headless.yaml
@@ -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(ENTITY_ID)}}"
+        url: "https://{{CONFORMANCE_IDP_HOSTNAME}}/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(ENTITY_ID)}}&ConsumerURL={{url_encode(BaseURL)}}"
+        url: "https://{{CONFORMANCE_IDP_HOSTNAME}}/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.yaml
index 8c8adbab144e62ae02bee7d75ba4ce1fd2eccc69..3393d5147afc19c130d707d043f1c2d9826a8b31 100644
--- a/nuclei-templates/saml-raw.yaml
+++ b/nuclei-templates/saml-raw.yaml
@@ -26,13 +26,13 @@ http:
   - raw:
       - |
         @Host: https://{{CONFORMANCE_IDP_HOSTNAME}}
-        POST /module.php/conformance/test/setup?testId={{url_encode(TEST_CASE)}}&spEntityId={{url_encode(ENTITY_ID)}} HTTP/1.1
+        POST /module.php/conformance/test/setup?testId={{url_encode(TEST_CASE)}}&spEntityId={{url_encode(SP_ENTITY_ID)}} HTTP/1.1
         Host: {{CONFORMANCE_IDP_HOSTNAME}}
         Authorization: {{AUTHORIZATION}}
 
       - |
         @Host: https://{{CONFORMANCE_IDP_HOSTNAME}}
-        GET /saml2/idp/SSOService.php?spentityid={{url_encode(ENTITY_ID)}}&ConsumerURL={{url_encode(BaseURL)}} HTTP/1.1
+        GET /saml2/idp/SSOService.php?spentityid={{url_encode(SP_ENTITY_ID)}}&ConsumerURL={{url_encode(BaseURL)}} HTTP/1.1
         Host: {{CONFORMANCE_IDP_HOSTNAME}}
         Authorization: {{AUTHORIZATION}}
     disable-path-automerge: true