diff --git a/.github/workflows/_healthcheck_vm.yml b/.github/workflows/_healthcheck_vm.yml
index 4c46c5ee90..6ce1e279c1 100644
--- a/.github/workflows/_healthcheck_vm.yml
+++ b/.github/workflows/_healthcheck_vm.yml
@@ -45,7 +45,6 @@ on:
 
 jobs:
   check-status-and-maybe-shutdown:
-    environment: main
     runs-on: ${{ inputs.vm }}
     outputs:
       status: ${{ steps.status.outputs.main }}
diff --git a/.github/workflows/build-test-publish-wheel.yml b/.github/workflows/build-test-publish-wheel.yml
index b39719417b..aedcb842ff 100644
--- a/.github/workflows/build-test-publish-wheel.yml
+++ b/.github/workflows/build-test-publish-wheel.yml
@@ -33,7 +33,7 @@ jobs:
       python-package: nemo_rl
       packaging: uv
     secrets:
-      TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-      TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+      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_RELEASE_ENDPOINT }}
       SLACK_WEBHOOK_ADMIN: ${{ secrets.SLACK_WEBHOOK_ADMIN }}
diff --git a/.github/workflows/cicd-main.yml b/.github/workflows/cicd-main.yml
index 87a3a076d8..0bf1b1e556 100644
--- a/.github/workflows/cicd-main.yml
+++ b/.github/workflows/cicd-main.yml
@@ -170,7 +170,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
@@ -234,7 +234,6 @@ jobs:
     if: ${{ contains('docs L0 L1 L2', needs.pre-flight.outputs.test_level) }}
     runs-on: ${{ matrix.runner }}
     name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
-    environment: nemo-ci
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -286,7 +285,6 @@ jobs:
     runs-on: ${{ matrix.runner }}
     if: ${{ contains('L1 L2', needs.pre-flight.outputs.test_level) }}
     name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
-    environment: nemo-ci
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -334,6 +332,8 @@ jobs:
                 )
               )
             }}
+
+
           CI_SKIP: ${{ github.event.label.name == 'Skip CICD' }}
           TEST_LEVEL: ${{ needs.pre-flight.outputs.test_level }}
         run: |
@@ -346,7 +346,6 @@ jobs:
     name: Notify nightly test failure
     runs-on: ubuntu-latest
     needs: [CI_QA_Gate]
-    environment: main
     if: ${{ always() && github.event_name == 'schedule' && needs.CI_QA_Gate.result == 'failure' }}
     steps:
       - name: Send Slack notification
diff --git a/.github/workflows/healthcheck_vms.yml b/.github/workflows/healthcheck_vms.yml
index 40a5bc2d19..6b034c9a38 100644
--- a/.github/workflows/healthcheck_vms.yml
+++ b/.github/workflows/healthcheck_vms.yml
@@ -14,7 +14,7 @@
 name: VM Health Check and Reboot
 on:
   schedule:
-    - cron: '0 7 * * *'
+    - cron: "0 7 * * *"
   workflow_dispatch:
 
 jobs:
@@ -22,7 +22,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       list-of-vms: ${{ steps.main.outputs.main }}
-    environment: main
     steps:
       - name: Get list of VMs
         id: main
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4745bf2399..c036cbdd8f 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -47,8 +47,8 @@ jobs:
       create-gh-release: ${{ inputs.create-gh-release }}
       packaging: uv
     secrets:
-      TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-      TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+      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_WEBHOOK_ADMIN }}
       SLACK_WEBHOOK: ${{ secrets.SLACK_RELEASE_ENDPOINT }}
       PAT: ${{ secrets.PAT }}