diff --git a/.github/workflows/adapter-release.yml b/.github/workflows/adapter-release.yml
index a23886c55..5c591c6e2 100644
--- a/.github/workflows/adapter-release.yml
+++ b/.github/workflows/adapter-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -37,7 +37,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: adapter-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -58,12 +58,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/admin-domain-service-release.yml b/.github/workflows/admin-domain-service-release.yml
index 1a380489a..f818df8d8 100644
--- a/.github/workflows/admin-domain-service-release.yml
+++ b/.github/workflows/admin-domain-service-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -38,7 +38,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: admin-domain-service-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -74,12 +74,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/backoffice-release.yml b/.github/workflows/backoffice-release.yml
index 113e6dadd..97a5d2d8f 100644
--- a/.github/workflows/backoffice-release.yml
+++ b/.github/workflows/backoffice-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -38,7 +38,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: backoffice-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -74,12 +74,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/clean-acr.yml b/.github/workflows/clean-acr.yml
index d5126e9fa..67cb0179f 100644
--- a/.github/workflows/clean-acr.yml
+++ b/.github/workflows/clean-acr.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
     - name: Disable workflow
       run: |
-        curl -X PUT -H "Authorization: token ${{ secrets.WSO2_BOT_TOKEN }}" \
+        curl -X PUT -H "Authorization: token ${{ secrets.APK_BOT_TOKEN }}" \
           https://api.github.com/repos/wso2/apk/actions/workflows/49589306/disable
     - uses: azure/login@v1
       with:
@@ -25,6 +25,6 @@ jobs:
     - name: Enable workflow
       if: always()
       run: |
-        curl -X PUT -H "Authorization: token ${{ secrets.WSO2_BOT_TOKEN }}" \
+        curl -X PUT -H "Authorization: token ${{ secrets.APK_BOT_TOKEN }}" \
           https://api.github.com/repos/wso2/apk/actions/workflows/49589306/enable
           
diff --git a/.github/workflows/code-coverage.yaml b/.github/workflows/code-coverage.yaml
index f5658a87f..58ee646ba 100644
--- a/.github/workflows/code-coverage.yaml
+++ b/.github/workflows/code-coverage.yaml
@@ -48,12 +48,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: "0"
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: Run Gradle Build
         run: |
           ./build-apk.sh
diff --git a/.github/workflows/common-controller-release.yml b/.github/workflows/common-controller-release.yml
index 1b0b3815c..986752bf3 100644
--- a/.github/workflows/common-controller-release.yml
+++ b/.github/workflows/common-controller-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -37,7 +37,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: common-controller-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -58,12 +58,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/config-deployer-release.yml b/.github/workflows/config-deployer-release.yml
index fc8c1284a..12971a9e2 100644
--- a/.github/workflows/config-deployer-release.yml
+++ b/.github/workflows/config-deployer-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -38,7 +38,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: config-deployer-service-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -74,12 +74,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/devportal-domain-service-release.yml b/.github/workflows/devportal-domain-service-release.yml
index de78f76c8..3d3c8669b 100644
--- a/.github/workflows/devportal-domain-service-release.yml
+++ b/.github/workflows/devportal-domain-service-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -38,7 +38,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: devportal-domain-service-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -74,12 +74,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/enforcer-release.yml b/.github/workflows/enforcer-release.yml
index 5417cd771..39fec8275 100644
--- a/.github/workflows/enforcer-release.yml
+++ b/.github/workflows/enforcer-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -37,7 +37,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
   NEXUS_REPO_URL: ${{ secrets.NEXUS_REPO_URL }}
   NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
   NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
@@ -58,12 +58,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/idp-domain-service-release.yml b/.github/workflows/idp-domain-service-release.yml
index 74239a67c..9bfc2cf03 100644
--- a/.github/workflows/idp-domain-service-release.yml
+++ b/.github/workflows/idp-domain-service-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -37,7 +37,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: idp-domain-service-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -73,12 +73,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/idp-ui-release.yml b/.github/workflows/idp-ui-release.yml
index 35265ba7c..f897c4412 100644
--- a/.github/workflows/idp-ui-release.yml
+++ b/.github/workflows/idp-ui-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -37,7 +37,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: idp-ui-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -50,12 +50,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index d35afbd8b..215a38886 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -7,7 +7,7 @@ concurrency:
   group: integration-test-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}  
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}  
 jobs:
   build_adapter:
     if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
@@ -15,9 +15,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -27,9 +27,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -39,9 +39,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -52,9 +52,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -64,9 +64,9 @@ jobs:
       with:
         aks_deployment: true
       secrets:
-        WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-        WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-        WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+        APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+        APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+        APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
         DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
         AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
         AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -76,9 +76,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}      
@@ -88,9 +88,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -100,9 +100,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -133,18 +133,18 @@ jobs:
     - name: Create Image pull secret.
       shell: sh
       run: |
-        kubectl create secret docker-registry azure-registry --docker-server=${{ secrets.AZURE_ACR_NAME }}.azurecr.io --docker-username=${{ secrets.AZURE_ACR_USER }} --docker-password=${{ secrets.AZURE_ACR_PASSWORD }} --docker-email=${{ secrets.WSO2_BOT_EMAIL }} -n apk-integration-test
+        kubectl create secret docker-registry azure-registry --docker-server=${{ secrets.AZURE_ACR_NAME }}.azurecr.io --docker-username=${{ secrets.AZURE_ACR_USER }} --docker-password=${{ secrets.AZURE_ACR_PASSWORD }} --docker-email=${{ secrets.APK_BOT_EMAIL }} -n apk-integration-test
     - name: Checkout apk-repo.
       uses: actions/checkout@v3
       with:
         fetch-depth: "0"
         path: apk-repo
-        token: ${{ secrets.WSO2_BOT_TOKEN }}
+        token: ${{ secrets.APK_BOT_TOKEN }}
     - name: Set release username and email
       shell: sh
       run: |
-        git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-        git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+        git config --global user.name ${{ secrets.APK_BOT_USER }}
+        git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
 
     - name: checkout pull request and merge.
       shell: sh
@@ -236,18 +236,18 @@ jobs:
     - name: Create Image pull secret.
       shell: sh
       run: |
-        kubectl create secret docker-registry azure-registry --docker-server=${{ secrets.AZURE_ACR_NAME }}.azurecr.io --docker-username=${{ secrets.AZURE_ACR_USER }} --docker-password=${{ secrets.AZURE_ACR_PASSWORD }} --docker-email=${{ secrets.WSO2_BOT_EMAIL }} -n apk-integration-test
+        kubectl create secret docker-registry azure-registry --docker-server=${{ secrets.AZURE_ACR_NAME }}.azurecr.io --docker-username=${{ secrets.AZURE_ACR_USER }} --docker-password=${{ secrets.AZURE_ACR_PASSWORD }} --docker-email=${{ secrets.APK_BOT_EMAIL }} -n apk-integration-test
     - name: Checkout apk-repo.
       uses: actions/checkout@v3
       with:
         fetch-depth: "0"
         path: apk-repo
-        token: ${{ secrets.WSO2_BOT_TOKEN }}
+        token: ${{ secrets.APK_BOT_TOKEN }}
     - name: Set release username and email
       shell: sh
       run: |
-        git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-        git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+        git config --global user.name ${{ secrets.APK_BOT_USER }}
+        git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
 
     - name: checkout pull request and merge.
       shell: sh
diff --git a/.github/workflows/management-server-release.yml b/.github/workflows/management-server-release.yml
index 717f0aa4b..a4f761eb4 100644
--- a/.github/workflows/management-server-release.yml
+++ b/.github/workflows/management-server-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -37,7 +37,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: management-server-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -59,12 +59,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/ratelimiter-release.yml b/.github/workflows/ratelimiter-release.yml
index 4fa5612a6..d6262b703 100644
--- a/.github/workflows/ratelimiter-release.yml
+++ b/.github/workflows/ratelimiter-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -37,7 +37,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: ratelimiter-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -58,12 +58,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/.github/workflows/release-helm.yml b/.github/workflows/release-helm.yml
index 207b130a1..711698878 100644
--- a/.github/workflows/release-helm.yml
+++ b/.github/workflows/release-helm.yml
@@ -4,7 +4,7 @@ on:
   release:
     types: [created]
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -15,12 +15,12 @@ jobs:
       with:
         fetch-depth: "0"
         path: apk-repo
-        token: ${{ secrets.WSO2_BOT_TOKEN }}
+        token: ${{ secrets.APK_BOT_TOKEN }}
     - name: Set release username and email
       shell: sh
       run: |
-        git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-        git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+        git config --global user.name ${{ secrets.APK_BOT_USER }}
+        git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
     - name: Setup Helm
       uses: HelmRepo/helm-setup@v1
     - name: Package Chart
diff --git a/.github/workflows/router-release.yml b/.github/workflows/router-release.yml
index d172dae91..eea1092c6 100644
--- a/.github/workflows/router-release.yml
+++ b/.github/workflows/router-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -40,7 +40,7 @@ concurrency:
   group: router-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 
 jobs:
   build:
@@ -51,12 +51,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request_target' && contains(github.event.label.name, 'trigger-action')
diff --git a/workflows/adapter-release.yml b/workflows/adapter-release.yml
index 9fdbcc304..9868dfacd 100644
--- a/workflows/adapter-release.yml
+++ b/workflows/adapter-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -39,7 +39,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: adapter-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -60,12 +60,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/admin-domain-service-release.yml b/workflows/admin-domain-service-release.yml
index 943468160..0013bbd82 100644
--- a/workflows/admin-domain-service-release.yml
+++ b/workflows/admin-domain-service-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -42,7 +42,7 @@ concurrency:
   group: admin-domain-service-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -75,12 +75,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}          
+          token: ${{ secrets.APK_BOT_TOKEN }}          
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/backoffice-release.yml b/workflows/backoffice-release.yml
index 700311144..7b95a8297 100644
--- a/workflows/backoffice-release.yml
+++ b/workflows/backoffice-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -43,7 +43,7 @@ concurrency:
   group: backoffice-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -76,12 +76,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/clean-acr.yml b/workflows/clean-acr.yml
index 5bbdb047b..b66151947 100644
--- a/workflows/clean-acr.yml
+++ b/workflows/clean-acr.yml
@@ -4,14 +4,14 @@ on:
   schedule:
     - cron: "0 0 * * MON"
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}  
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}  
 jobs:
   clean:
     runs-on: ubuntu-latest
     steps:
     - name: Disable workflow
       run: |
-        curl -X PUT -H "Authorization: token ${{ secrets.WSO2_BOT_TOKEN }}" \
+        curl -X PUT -H "Authorization: token ${{ secrets.APK_BOT_TOKEN }}" \
           https://api.github.com/repos/wso2/apk/actions/workflows/49589306/disable
     - uses: azure/login@v1
       with:
@@ -27,6 +27,6 @@ jobs:
     - name: Enable workflow
       if: always()
       run: |
-        curl -X PUT -H "Authorization: token ${{ secrets.WSO2_BOT_TOKEN }}" \
+        curl -X PUT -H "Authorization: token ${{ secrets.APK_BOT_TOKEN }}" \
           https://api.github.com/repos/wso2/apk/actions/workflows/49589306/enable
           
diff --git a/workflows/code-coverage.yaml b/workflows/code-coverage.yaml
index d39e87173..ff6927da6 100644
--- a/workflows/code-coverage.yaml
+++ b/workflows/code-coverage.yaml
@@ -48,12 +48,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: "0"
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: Run Gradle Build
         run: |
           ./build-apk.sh
diff --git a/workflows/common-controller-release.yml b/workflows/common-controller-release.yml
index f16a4d63d..c3d2f5374 100644
--- a/workflows/common-controller-release.yml
+++ b/workflows/common-controller-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -39,7 +39,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: common-controller-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -60,12 +60,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/config-deployer-release.yml b/workflows/config-deployer-release.yml
index 0395380f6..8ece6bda5 100644
--- a/workflows/config-deployer-release.yml
+++ b/workflows/config-deployer-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -40,7 +40,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 
 concurrency:
   group: config-deployer-service-${{ github.event.number || github.run_id }}
@@ -77,12 +77,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/devportal-domain-service-release.yml b/workflows/devportal-domain-service-release.yml
index 8c4fcefcb..135fcd797 100644
--- a/workflows/devportal-domain-service-release.yml
+++ b/workflows/devportal-domain-service-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -40,7 +40,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: devportal-domain-service-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -76,12 +76,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/enforcer-release.yml b/workflows/enforcer-release.yml
index 391b4c740..d57672069 100644
--- a/workflows/enforcer-release.yml
+++ b/workflows/enforcer-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -39,7 +39,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
   NEXUS_REPO_URL: ${{ secrets.NEXUS_REPO_URL }}
   NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
   NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
@@ -60,12 +60,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/idp-domain-service-release.yml b/workflows/idp-domain-service-release.yml
index ce2d163ef..c728e8309 100644
--- a/workflows/idp-domain-service-release.yml
+++ b/workflows/idp-domain-service-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -42,7 +42,7 @@ concurrency:
   group: idp-domain-service-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -76,12 +76,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/idp-ui-release.yml b/workflows/idp-ui-release.yml
index c9021a435..0cc36efd4 100644
--- a/workflows/idp-ui-release.yml
+++ b/workflows/idp-ui-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -40,7 +40,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: idp-ui-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -54,12 +54,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/integration-test.yml b/workflows/integration-test.yml
index d8ca768dd..683134258 100644
--- a/workflows/integration-test.yml
+++ b/workflows/integration-test.yml
@@ -6,7 +6,7 @@ on:
 concurrency: 
   group: integration-test-${{ github.event.number || github.run_id }}
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}  
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}  
 jobs:
   build_adapter:
     if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
@@ -14,9 +14,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -26,9 +26,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -38,9 +38,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -51,9 +51,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -63,9 +63,9 @@ jobs:
       with:
         aks_deployment: true
       secrets:
-        WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-        WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-        WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+        APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+        APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+        APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
         DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
         AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
         AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -75,9 +75,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}      
@@ -87,9 +87,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -99,9 +99,9 @@ jobs:
     with:
       aks_deployment: true
     secrets:
-      WSO2_BOT_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
-      WSO2_BOT_USER: ${{ secrets.WSO2_BOT_USER }}
-      WSO2_BOT_EMAIL: ${{ secrets.WSO2_BOT_EMAIL }}
+      APK_BOT_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
+      APK_BOT_USER: ${{ secrets.APK_BOT_USER }}
+      APK_BOT_EMAIL: ${{ secrets.APK_BOT_EMAIL }}
       DOCKER_ORGANIZATION: ${{ secrets.AZURE_ACR_NAME }}.azurecr.io
       AZURE_ACR_NAME: ${{ secrets.AZURE_ACR_NAME }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
@@ -132,18 +132,18 @@ jobs:
     - name: Create Image pull secret.
       shell: sh
       run: |
-        kubectl create secret docker-registry azure-registry --docker-server=${{ secrets.AZURE_ACR_NAME }}.azurecr.io --docker-username=${{ secrets.AZURE_ACR_USER }} --docker-password=${{ secrets.AZURE_ACR_PASSWORD }} --docker-email=${{ secrets.WSO2_BOT_EMAIL }} -n apk-integration-test
+        kubectl create secret docker-registry azure-registry --docker-server=${{ secrets.AZURE_ACR_NAME }}.azurecr.io --docker-username=${{ secrets.AZURE_ACR_USER }} --docker-password=${{ secrets.AZURE_ACR_PASSWORD }} --docker-email=${{ secrets.APK_BOT_EMAIL }} -n apk-integration-test
     - name: Checkout apk-repo.
       uses: actions/checkout@v3
       with:
         fetch-depth: "0"
         path: apk-repo
-        token: ${{ secrets.WSO2_BOT_TOKEN }}
+        token: ${{ secrets.APK_BOT_TOKEN }}
     - name: Set release username and email
       shell: sh
       run: |
-        git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-        git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+        git config --global user.name ${{ secrets.APK_BOT_USER }}
+        git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
 
     - name: checkout pull request and merge.
       shell: sh
@@ -235,18 +235,18 @@ jobs:
     - name: Create Image pull secret.
       shell: sh
       run: |
-        kubectl create secret docker-registry azure-registry --docker-server=${{ secrets.AZURE_ACR_NAME }}.azurecr.io --docker-username=${{ secrets.AZURE_ACR_USER }} --docker-password=${{ secrets.AZURE_ACR_PASSWORD }} --docker-email=${{ secrets.WSO2_BOT_EMAIL }} -n apk-integration-test
+        kubectl create secret docker-registry azure-registry --docker-server=${{ secrets.AZURE_ACR_NAME }}.azurecr.io --docker-username=${{ secrets.AZURE_ACR_USER }} --docker-password=${{ secrets.AZURE_ACR_PASSWORD }} --docker-email=${{ secrets.APK_BOT_EMAIL }} -n apk-integration-test
     - name: Checkout apk-repo.
       uses: actions/checkout@v3
       with:
         fetch-depth: "0"
         path: apk-repo
-        token: ${{ secrets.WSO2_BOT_TOKEN }}
+        token: ${{ secrets.APK_BOT_TOKEN }}
     - name: Set release username and email
       shell: sh
       run: |
-        git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-        git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+        git config --global user.name ${{ secrets.APK_BOT_USER }}
+        git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
 
     - name: checkout pull request and merge.
       shell: sh
diff --git a/workflows/management-server-release.yml b/workflows/management-server-release.yml
index 893092db2..c565d11bf 100644
--- a/workflows/management-server-release.yml
+++ b/workflows/management-server-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -42,7 +42,7 @@ concurrency:
   group: management-server-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 
 jobs:
   build:
@@ -62,12 +62,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/ratelimiter-release.yml b/workflows/ratelimiter-release.yml
index 62e52fa2f..8587c5ed4 100644
--- a/workflows/ratelimiter-release.yml
+++ b/workflows/ratelimiter-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -39,7 +39,7 @@ on:
     branches:
       - 'main'
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 concurrency:
   group: ratelimiter-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
@@ -60,12 +60,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/release-helm.yml b/workflows/release-helm.yml
index e5090f171..1f1b9ea0f 100644
--- a/workflows/release-helm.yml
+++ b/workflows/release-helm.yml
@@ -4,7 +4,7 @@ on:
   release:
     types: [created]
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -15,12 +15,12 @@ jobs:
       with:
         fetch-depth: "0"
         path: apk-repo
-        token: ${{ secrets.WSO2_BOT_TOKEN }}
+        token: ${{ secrets.APK_BOT_TOKEN }}
     - name: Set release username and email
       shell: sh
       run: |
-        git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-        git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+        git config --global user.name ${{ secrets.APK_BOT_USER }}
+        git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
     - name: Setup Helm
       uses: HelmRepo/helm-setup@v1
     - name: Package Chart
diff --git a/workflows/router-release.yml b/workflows/router-release.yml
index 4b3cf1747..2960ad087 100644
--- a/workflows/router-release.yml
+++ b/workflows/router-release.yml
@@ -7,11 +7,11 @@ on:
         type: boolean
         description: "Deploy to AKS"
     secrets:
-      WSO2_BOT_TOKEN:
+      APK_BOT_TOKEN:
         required: true
-      WSO2_BOT_USER:
+      APK_BOT_USER:
         required: true
-      WSO2_BOT_EMAIL:
+      APK_BOT_EMAIL:
         required: true
       DOCKER_ORGANIZATION:
         required: true
@@ -42,7 +42,7 @@ concurrency:
   group: router-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 
 jobs:
   build:
@@ -53,12 +53,12 @@ jobs:
         with:
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
diff --git a/workflows/run-integration-tests.yml b/workflows/run-integration-tests.yml
index 7bddcbd4e..9ecf06c2d 100644
--- a/workflows/run-integration-tests.yml
+++ b/workflows/run-integration-tests.yml
@@ -15,7 +15,7 @@ concurrency:
   group: test-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 env:
-  GH_TOKEN: ${{ secrets.WSO2_BOT_TOKEN }}
+  GH_TOKEN: ${{ secrets.APK_BOT_TOKEN }}
 
 jobs:
   build:
@@ -35,12 +35,12 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: "0"
           path: apk-repo
-          token: ${{ secrets.WSO2_BOT_TOKEN }}
+          token: ${{ secrets.APK_BOT_TOKEN }}
       - name: Set release username and email
         shell: sh
         run: |
-          git config --global user.name ${{ secrets.WSO2_BOT_USER }}
-          git config --global user.email ${{ secrets.WSO2_BOT_EMAIL }}
+          git config --global user.name ${{ secrets.APK_BOT_USER }}
+          git config --global user.email ${{ secrets.APK_BOT_EMAIL }}
       - name: checkout pull request and merge.
         shell: sh
         if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'