diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 42f564f..8c5b349 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -72,7 +72,7 @@ jobs:
       -
         name: Create KUBECONFIG
         env:
-          KUBE_CONFIG: '${{ secrets.KUBECONFIG_TEST }}'
+          KUBE_CONFIG: '${{ secrets.KUBECONFIG_TEST_AV2 }}'
         run: |
           mkdir -p $HOME/.kube
           echo "$KUBE_CONFIG" > $HOME/.kube/config
@@ -80,7 +80,7 @@ jobs:
         name: Deploy Helm Release
         env:
           TRAINING_HELM_RELEASE: 'pr-${{ github.event.pull_request.number }}'
-          TRAINING_NAMESPACE: 'pitc-jenkins-techlab-test'
+          TRAINING_NAMESPACE: 'pitc-cicd-jenkins-techlab-test'
           TRAINING_VERSION: '${{ github.sha }}'
         run: |
           helm upgrade $TRAINING_HELM_RELEASE acend-training-chart --install --wait \
@@ -96,7 +96,7 @@ jobs:
         env:
           TRAINING_HELM_RELEASE: 'pr-${{ github.event.pull_request.number }}'
           TRAINING_HELM_NAME: 'jenkins-techlab-puzzle'
-          TRAINING_NAMESPACE: 'pitc-jenkins-techlab-test'
+          TRAINING_NAMESPACE: 'pitc-cicd-jenkins-techlab-test'
         run: |
           kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME} \
             --kubeconfig $HOME/.kube/config \
diff --git a/.github/workflows/pr-cleanup.yaml b/.github/workflows/pr-cleanup.yaml
index 8a52b2e..cc76d76 100644
--- a/.github/workflows/pr-cleanup.yaml
+++ b/.github/workflows/pr-cleanup.yaml
@@ -25,7 +25,7 @@ jobs:
       -
         name: Create KUBECONFIG
         env:
-          KUBE_CONFIG: '${{ secrets.KUBECONFIG_TEST }}'
+          KUBE_CONFIG: '${{ secrets.KUBECONFIG_TEST_AV2 }}'
         run: |
           mkdir -p $HOME/.kube
           echo "$KUBE_CONFIG" > $HOME/.kube/config
@@ -33,7 +33,7 @@ jobs:
         name: Remove PR Environment Helm Release
         env:
           TRAINING_HELM_RELEASE: 'pr-${{ github.event.pull_request.number }}'
-          TRAINING_NAMESPACE: 'pitc-jenkins-techlab-test'
+          TRAINING_NAMESPACE: 'pitc-cicd-jenkins-techlab-test'
           TRAINING_VERSION: '${{ github.sha }}'
         run: |
           helm uninstall $TRAINING_HELM_RELEASE --kubeconfig $HOME/.kube/config  --namespace=$TRAINING_NAMESPACE
diff --git a/.github/workflows/push-main.yaml b/.github/workflows/push-main.yaml
index a9ff112..0ad74c8 100644
--- a/.github/workflows/push-main.yaml
+++ b/.github/workflows/push-main.yaml
@@ -74,7 +74,7 @@ jobs:
       -
         name: Create KUBECONFIG
         env:
-          KUBE_CONFIG: '${{ secrets.KUBECONFIG }}'
+          KUBE_CONFIG: '${{ secrets.KUBECONFIG_PROD_AV2 }}'
         run: |
           mkdir -p $HOME/.kube
           echo "$KUBE_CONFIG" > $HOME/.kube/config
@@ -82,7 +82,7 @@ jobs:
         name: Deploy Helm Release
         env:
           TRAINING_HELM_RELEASE: 'latest'
-          TRAINING_NAMESPACE: 'pitc-jenkins-techlab-prod'
+          TRAINING_NAMESPACE: 'pitc-cicd-jenkins-techlab-prod'
           TRAINING_VERSION: '${{ github.sha }}'
         run: |
           helm upgrade $TRAINING_HELM_RELEASE acend-training-chart --install --wait \
@@ -99,7 +99,7 @@ jobs:
         env:
           TRAINING_HELM_RELEASE: 'latest'
           TRAINING_HELM_NAME: 'jenkins-techlab-puzzle'
-          TRAINING_NAMESPACE: 'pitc-jenkins-techlab-prod'
+          TRAINING_NAMESPACE: 'pitc-cicd-jenkins-techlab-prod'
         run: |
           kubectl rollout restart deployment/${TRAINING_HELM_RELEASE}-${TRAINING_HELM_NAME} \
             --kubeconfig $HOME/.kube/config \