diff --git a/.github/workflows/integration-test-DEV.yaml b/.github/workflows/integration-test-DEV.yaml
index 689a647229..8fb3a551c2 100644
--- a/.github/workflows/integration-test-DEV.yaml
+++ b/.github/workflows/integration-test-DEV.yaml
@@ -23,9 +23,9 @@ jobs:
   trigger-integration-test:
     uses: ./.github/workflows/xray-cucumber-integration.yaml
     secrets:
-      keycloakTokenUrl: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_TOKEN_URI }}
-      clientId: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_ID }}
-      clientSecret: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_SECRET }}
+      oauth2TokenUrl: ${{ secrets.OAUTH2_CLIENT_TOKEN_URI }}
+      clientId: ${{ secrets.OAUTH2_CLIENT_ID }}
+      clientSecret: ${{ secrets.OAUTH2_CLIENT_SECRET }}
       jiraUser: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
       jiraPassword: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
     with:
diff --git a/.github/workflows/integration-test-DIL.yaml b/.github/workflows/integration-test-DIL.yaml
index 30edcc77a2..501a816659 100644
--- a/.github/workflows/integration-test-DIL.yaml
+++ b/.github/workflows/integration-test-DIL.yaml
@@ -12,7 +12,7 @@ jobs:
   trigger-integration-test:
     uses: ./.github/workflows/xray-cucumber-integration.yaml
     secrets:
-      keycloakTokenUrl: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_TOKEN_URI }}
+      oauth2TokenUrl: ${{ secrets.OAUTH2_CLIENT_TOKEN_URI }}
       clientId: ${{ secrets.IRS_OAUTH2_CLIENT_ID_DIL }}
       clientSecret: ${{ secrets.IRS_OAUTH2_CLIENT_SECRET_DIL }}
       jiraUser: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
diff --git a/.github/workflows/integration-test-INT.yaml b/.github/workflows/integration-test-INT.yaml
index 140bd54d00..bbe00c2634 100644
--- a/.github/workflows/integration-test-INT.yaml
+++ b/.github/workflows/integration-test-INT.yaml
@@ -7,7 +7,7 @@ jobs:
   trigger-integration-test:
     uses: ./.github/workflows/xray-cucumber-integration.yaml
     secrets:
-      keycloakTokenUrl: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_TOKEN_URI }}
+      oauth2TokenUrl: ${{ secrets.OAUTH2_CLIENT_TOKEN_URI }}
       clientId: ${{ secrets.ORG_IRS_OAUTH2_CLIENT_ID_INT }}
       clientSecret: ${{ secrets.ORG_IRS_OAUTH2_CLIENT_SECRET_INT }}
       jiraUser: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
diff --git a/.github/workflows/xray-cucumber.yaml b/.github/workflows/xray-cucumber.yaml
index 633e90f482..3b73158595 100644
--- a/.github/workflows/xray-cucumber.yaml
+++ b/.github/workflows/xray-cucumber.yaml
@@ -31,9 +31,9 @@ jobs:
   trigger-integration-test:
     uses: ./.github/workflows/xray-cucumber-integration.yaml
     secrets:
-      keycloakTokenUrl: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_TOKEN_URI }}
-      clientId: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_ID }}
-      clientSecret: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_SECRET }}
+      oauth2TokenUrl: ${{ secrets.OAUTH2_CLIENT_TOKEN_URI }}
+      clientId: ${{ secrets.OAUTH2_CLIENT_ID }}
+      clientSecret: ${{ secrets.OAUTH2_CLIENT_SECRET }}
       jiraUser: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
       jiraPassword: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
     with:
diff --git a/docs/src/docs/security/security-assessment.md b/docs/src/docs/security/security-assessment.md
index a2bd28e658..cd83d1f730 100644
--- a/docs/src/docs/security/security-assessment.md
+++ b/docs/src/docs/security/security-assessment.md
@@ -13,7 +13,7 @@ System_Ext(EDC, "EDC")
 System_Ext(EDC-DS, "EDC Discovery Service")
 System_Ext(DF, "Discovery Finder")
 System_Ext(DTR, "Digital Twin Registry")
-System_Ext(KC, "Keycloak")
+System_Ext(OAuth2, "OAuth2")
 System_Ext(BPDM, "BPDM")
 System_Ext(SH, "Semantic Hub")
 
@@ -46,7 +46,7 @@ Rel(IRS-App, EDC, "https, access token")
 Rel(IRS-App, EDC-DS, "Find decentral DTs, https, access token")
 Rel(IRS-App, DF, "Get EDC Discovery Service URL, https, access token")
 Rel(IRS-App, DTR, "https, access token")
-Rel(IRS-App, KC, "https, clientID, clientSecret, Get tokens to access DTR")
+Rel(IRS-App, OAuth2, "https, clientID, clientSecret, Get tokens to access DTR")
 Rel(IRS-App, BPDM, "https, access token, Get BPN")
 Rel(IRS-App, SH, "Get schemas to validate response from EDC, https, access token")