diff --git a/.github/workflows/build-test-publish-wheel.yml b/.github/workflows/build-test-publish-wheel.yml
index 22204979d6..dd7b41f9e4 100644
--- a/.github/workflows/build-test-publish-wheel.yml
+++ b/.github/workflows/build-test-publish-wheel.yml
@@ -63,10 +63,10 @@ jobs:
       submodules: recursive
       container-options: "--gpus all --runtime=nvidia"
     secrets:
-      TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-      TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-      SLACK_WEBHOOK: ${{ secrets.SLACK_RELEASE_ENDPOINT }}
-      SLACK_WEBHOOK_ADMIN: ${{ secrets.SLACK_WEBHOOK_ADMIN }}
+      TWINE_USERNAME: __token__
+      TWINE_PASSWORD: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/r')) && secrets.SVC_PYPI_TOKEN || secrets.SVC_PYPI_TEST_TOKEN }}
+      SLACK_WEBHOOK: ${{ secrets.SLACK_CI_CHANNEL_WEBHOOK }}
+      SLACK_WEBHOOK_ADMIN: ${{ secrets.SLACK_TEAM_GROUP_ID }}
       GH_TOKEN: ${{ secrets.PAT }}
 
   build-test-publish-wheel-summary:
diff --git a/.github/workflows/cache-hf-model.yml b/.github/workflows/cache-hf-model.yml
index c31af864bc..2955e79018 100644
--- a/.github/workflows/cache-hf-model.yml
+++ b/.github/workflows/cache-hf-model.yml
@@ -25,7 +25,6 @@ jobs:
   download:
     name: Download Model
     runs-on: self-hosted-nemo
-    environment: nemo-ci
     env:
       HF_HUB_OFFLINE: 0
       HF_HOME: /mnt/datadrive/TestData/HF_HOME
@@ -47,7 +46,7 @@ jobs:
         env:
           HF_ACCESS_TOKEN: ${{ secrets.HF_ACCESS_TOKEN }}
         run: |
-            hf auth login --token ${HF_ACCESS_TOKEN}
+          hf auth login --token ${HF_ACCESS_TOKEN}
 
       - name: Download model
         env:
diff --git a/.github/workflows/cherry-pick-release-commit.yml b/.github/workflows/cherry-pick-release-commit.yml
index 32f06df504..9129820fa9 100644
--- a/.github/workflows/cherry-pick-release-commit.yml
+++ b/.github/workflows/cherry-pick-release-commit.yml
@@ -10,5 +10,5 @@ jobs:
     uses: NVIDIA-NeMo/FW-CI-templates/.github/workflows/_cherry_pick.yml@v0.63.0
     secrets:
       PAT: ${{ secrets.PAT }}
-      SLACK_WEBHOOK_ADMIN: ${{ secrets.SLACK_WEBHOOK_ADMIN }}
-      SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_ADMIN: ${{ secrets.SLACK_REPOPIC_GROUP_ID }}
+      SLACK_WEBHOOK: ${{ secrets.SLACK_CI_CHANNEL_WEBHOOK }}
diff --git a/.github/workflows/cicd-approve-test-queue.yml b/.github/workflows/cicd-approve-test-queue.yml
index c5e0e71b39..b563169ea9 100644
--- a/.github/workflows/cicd-approve-test-queue.yml
+++ b/.github/workflows/cicd-approve-test-queue.yml
@@ -16,13 +16,12 @@ name: Approve Test Queue
 
 on:
   schedule:
-    - cron: '*/5 * * * *'  # Runs every 5 minutes
-  workflow_dispatch:  # Allows manual triggering
+    - cron: "*/5 * * * *" # Runs every 5 minutes
+  workflow_dispatch: # Allows manual triggering
 
 jobs:
   approve-queue:
     runs-on: ubuntu-latest
-    environment: main
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/cicd-main.yml b/.github/workflows/cicd-main.yml
index 5543dae6f4..b5d7c46488 100644
--- a/.github/workflows/cicd-main.yml
+++ b/.github/workflows/cicd-main.yml
@@ -471,7 +471,6 @@ jobs:
       )
       && needs.pre-flight.outputs.is_ci_workload == 'false'
       && !cancelled()
-    environment: nemo-ci
     steps:
       - name: Generate fake coverage report
         uses: actions/github-script@v6
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
index 85d051c210..b215da53e5 100644
--- a/.github/workflows/dependabot.yml
+++ b/.github/workflows/dependabot.yml
@@ -11,7 +11,6 @@ permissions:
 jobs:
   get-release-branch-names:
     runs-on: ubuntu-latest
-    environment: nemo-ci
     outputs:
       megatron-bridge: ${{ steps.get-branch.outputs.megatron_bridge_release_branch }}
       mcore: ${{ steps.get-branch.outputs.mcore_latest_branch }}
@@ -62,8 +61,8 @@ jobs:
     steps:
       - name: Notify
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_WEBHOOK_ADMIN: <!subteam^${{ secrets.SLACK_WEBHOOK_ADMIN }}>
+          SLACK_WEBHOOK: ${{ secrets.SLACK_CI_CHANNEL_WEBHOOK }}
+          SLACK_WEBHOOK_ADMIN: <!subteam^${{ secrets.SLACK_TEAM_GROUP_ID }}>
           GITHUB_RUN_ID: ${{ github.run_id }}
           GITHUB_REPOSITORY: ${{ github.repository }}
         run: |
diff --git a/.github/workflows/install-test.yml b/.github/workflows/install-test.yml
index 006d1bef0f..62bc55cab1 100644
--- a/.github/workflows/install-test.yml
+++ b/.github/workflows/install-test.yml
@@ -73,7 +73,6 @@ jobs:
   #   name: Pip - Python${{ matrix.python-version }}${{ matrix.extra-groups != '' && format('[{0}]', matrix.extra-groups) || '' }} - AMD64/Linux - NGC PyTorch
   #   container:
   #     image: nvcr.io/nvidia/pytorch:25.05-py3
-  #   environment: nemo-ci
   #   strategy:
   #     fail-fast: false
   #     matrix:
@@ -128,7 +127,6 @@ jobs:
     name: UV - Python${{ matrix.python-version }} - AMD64/Linux - NGC PyTorch
     container:
       image: nvcr.io/nvidia/pytorch:25.05-py3
-    environment: nemo-ci
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/release-freeze.yml b/.github/workflows/release-freeze.yml
index 304d5b84a8..08c4dba90b 100644
--- a/.github/workflows/release-freeze.yml
+++ b/.github/workflows/release-freeze.yml
@@ -44,14 +44,13 @@ jobs:
       dry-run: ${{ inputs.dry-run }}
       use-pat: true
     secrets:
-      SLACK_WEBHOOK: ${{ secrets.SLACK_RELEASE_ENDPOINT }}
-      SLACK_WEBHOOK_ADMIN: ${{ secrets.SLACK_WEBHOOK_ADMIN }}
+      SLACK_WEBHOOK: ${{ secrets.SLACK_MAIN_CHANNEL_WEBHOOK }}
+      SLACK_WEBHOOK_ADMIN: ${{ secrets.SLACK_TEAM_GROUP_ID }}
       PAT: ${{ secrets.PAT }}
 
   bump-docs-versions:
     needs: [code-freeze]
     runs-on: ubuntu-latest
-    environment: main
     env:
       VERSION: ${{ needs.code-freeze.outputs.release-branch }}
       DRY_RUN: ${{ inputs.dry-run }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index fce45633e3..297b7d686d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -59,10 +59,10 @@ jobs:
       no-build-isolation: true
       app-id: ${{ vars.BOT_ID }}
     secrets:
-      TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-      TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-      SLACK_WEBHOOK_ADMIN: ${{ secrets.SLACK_WEBHOOK_ADMIN }}
-      SLACK_WEBHOOK: ${{ secrets.SLACK_RELEASE_ENDPOINT }}
+      TWINE_USERNAME: __token__
+      TWINE_PASSWORD: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/r')) && secrets.SVC_PYPI_TOKEN || secrets.SVC_PYPI_TEST_TOKEN }}
+      SLACK_WEBHOOK_ADMIN: ${{ secrets.SLACK_TEAM_GROUP_ID }}
+      SLACK_WEBHOOK: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/r')) && secrets.SLACK_MAIN_CHANNEL_WEBHOOK || secrets.SLACK_CI_CHANNEL_WEBHOOK }}
       PAT: ${{ secrets.PAT }}
       SSH_KEY: ${{ secrets.SSH_KEY }}
       SSH_PWD: ${{ secrets.SSH_PWD }}