diff --git a/.github/workflows/Code-Quality-check.yml b/.github/workflows/Code-Quality-check.yml
index 32bbac31f..c7a25866f 100644
--- a/.github/workflows/Code-Quality-check.yml
+++ b/.github/workflows/Code-Quality-check.yml
@@ -11,11 +11,6 @@ permissions:
   checks: write
   statuses: write
 
-env:
-  CLOUD_STORE_GROUP_ID: ${{ vars.CLOUD_STORE_GROUP_ID }}
-  CLOUD_STORE_ARTIFACT_ID: ${{ vars.CLOUD_STORE_ARTIFACT_ID }}
-  CLOUD_STORE_VERSION: ${{ vars.CLOUD_STORE_VERSION }}
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -44,9 +39,9 @@ jobs:
       - name: Build Knowledge Platform
         run: |
           mvn clean install -DskipTests=true \
-          -DCLOUD_STORE_GROUP_ID=${CLOUD_STORE_GROUP_ID} \
-          -DCLOUD_STORE_ARTIFACT_ID=${CLOUD_STORE_ARTIFACT_ID}  \
-          -DCLOUD_STORE_VERSION=${CLOUD_STORE_VERSION}
+          -DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
+          -DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
+          -DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
 
   test-content:
     needs: build
@@ -64,9 +59,9 @@ jobs:
         working-directory: content-api/content-service/
         run: |
           mvn clean org.jacoco:jacoco-maven-plugin:0.8.8:prepare-agent test org.jacoco:jacoco-maven-plugin:0.8.8:report \
-          -DCLOUD_STORE_GROUP_ID=${CLOUD_STORE_GROUP_ID} \
-          -DCLOUD_STORE_ARTIFACT_ID=${CLOUD_STORE_ARTIFACT_ID}  \
-          -DCLOUD_STORE_VERSION=${CLOUD_STORE_VERSION}
+          -DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
+          -DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
+          -DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
 
       - name: Upload Content Test Results
         if: always()
@@ -100,9 +95,9 @@ jobs:
         working-directory: taxonomy-api/taxonomy-service/
         run: |
           mvn clean org.jacoco:jacoco-maven-plugin:0.8.8:prepare-agent test org.jacoco:jacoco-maven-plugin:0.8.8:report \
-          -DCLOUD_STORE_GROUP_ID=${CLOUD_STORE_GROUP_ID} \
-          -DCLOUD_STORE_ARTIFACT_ID=${CLOUD_STORE_ARTIFACT_ID}  \
-          -DCLOUD_STORE_VERSION=${CLOUD_STORE_VERSION}
+          -DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
+          -DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
+          -DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
 
       - name: Upload Taxonomy Test Results
         if: always()
@@ -136,9 +131,9 @@ jobs:
         working-directory: search-api/search-service
         run: |
           mvn clean org.jacoco:jacoco-maven-plugin:0.8.8:prepare-agent test org.jacoco:jacoco-maven-plugin:0.8.8:report \
-          -DCLOUD_STORE_GROUP_ID=${CLOUD_STORE_GROUP_ID} \
-          -DCLOUD_STORE_ARTIFACT_ID=${CLOUD_STORE_ARTIFACT_ID}  \
-          -DCLOUD_STORE_VERSION=${CLOUD_STORE_VERSION}
+          -DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
+          -DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
+          -DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
 
       - name: Upload Search Test Results
         if: always()
@@ -173,9 +168,9 @@ jobs:
         working-directory: content-api/content-service
         run: |
           mvn sonar:sonar \
-          -DCLOUD_STORE_GROUP_ID=${CLOUD_STORE_GROUP_ID} \
-          -DCLOUD_STORE_ARTIFACT_ID=${CLOUD_STORE_ARTIFACT_ID} \
-          -DCLOUD_STORE_VERSION=${CLOUD_STORE_VERSION} \
+          -DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
+          -DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
+          -DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }} \
           -Dsonar.projectKey=Sunbird-Knowlg_knowledge-platform \
           -Dsonar.organization=sunbird-knowlg-1 \
           -Dsonar.host.url=https://sonarcloud.io \
@@ -198,9 +193,9 @@ jobs:
         working-directory: taxonomy-api/taxonomy-service
         run: |
           mvn sonar:sonar \
-          -DCLOUD_STORE_GROUP_ID=${CLOUD_STORE_GROUP_ID} \
-          -DCLOUD_STORE_ARTIFACT_ID=${CLOUD_STORE_ARTIFACT_ID} \
-          -DCLOUD_STORE_VERSION=${CLOUD_STORE_VERSION} \
+          -DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
+          -DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
+          -DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }} \
           -Dsonar.projectKey=Sunbird-Knowlg_knowledge-platform \
           -Dsonar.organization=sunbird-knowlg-1 \
           -Dsonar.host.url=https://sonarcloud.io \
@@ -226,14 +221,14 @@ jobs:
         working-directory: search-api/search-service
         run: |
           mvn clean compile \
-            -DCLOUD_STORE_GROUP_ID=${CLOUD_STORE_GROUP_ID} \
-            -DCLOUD_STORE_ARTIFACT_ID=${CLOUD_STORE_ARTIFACT_ID} \
-            -DCLOUD_STORE_VERSION=${CLOUD_STORE_VERSION}
+            -DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
+            -DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
+            -DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }}
 
           mvn sonar:sonar \
-            -DCLOUD_STORE_GROUP_ID=${CLOUD_STORE_GROUP_ID} \
-            -DCLOUD_STORE_ARTIFACT_ID=${CLOUD_STORE_ARTIFACT_ID} \
-            -DCLOUD_STORE_VERSION=${CLOUD_STORE_VERSION} \
+            -DCLOUD_STORE_GROUP_ID=${{ vars.CLOUD_STORE_GROUP_ID }} \
+            -DCLOUD_STORE_ARTIFACT_ID=${{ vars.CLOUD_STORE_ARTIFACT_ID }} \
+            -DCLOUD_STORE_VERSION=${{ vars.CLOUD_STORE_VERSION }} \
             -Dsonar.projectKey=Sunbird-Knowlg_knowledge-platform \
             -Dsonar.organization=sunbird-knowlg-1 \
             -Dsonar.host.url=https://sonarcloud.io \