diff --git a/.github/workflows/cicd-main.yml b/.github/workflows/cicd-main.yml
index e54b0b4..b43cc0f 100644
--- a/.github/workflows/cicd-main.yml
+++ b/.github/workflows/cicd-main.yml
@@ -58,35 +58,10 @@ jobs:
           - script: L0_Tests_GPU
             runner: self-hosted-nemo
             timeout: 30
-    needs: [cicd-container-build]
-    runs-on: ${{ matrix.runner }}
-    name: ${{ matrix.script }}
-    environment: nemo-ci
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: main
-        uses: ./.github/actions/test-template
-        with:
-          runner: ${{ runner.name }}
-          script: ${{ matrix.script }}
-          timeout: ${{ matrix.timeout || 10 }}
-          is_unit_test: "true"
-          image: emerging_optimizers
-          cpu-only: ${{ matrix.cpu-only || false }}
-          has-azure-credentials: "true"
-          azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-
-  cicd-unit-tests-cpu:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
           - script: L0_Tests_CPU
             runner: linux-amd64-cpu16
             timeout: 30
+            cpu-only: true
     needs: [cicd-container-build]
     runs-on: ${{ matrix.runner }}
     name: ${{ matrix.script }}
@@ -102,35 +77,6 @@ jobs:
           timeout: ${{ matrix.timeout || 10 }}
           is_unit_test: "true"
           image: emerging_optimizers
-          cpu-only: ${{ matrix.cpu-only || true }}
-          has-azure-credentials: "true"
-          azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-
-  cicd-e2e-tests:
-    if: false
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - script: L2_Functional_Tests_GPU
-            runner: self-hosted-nemo
-            timeout: 30
-    needs: [cicd-unit-tests]
-    runs-on: ${{ matrix.runner }}
-    name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
-    environment: nemo-ci
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: main
-        uses: ./.github/actions/test-template
-        with:
-          runner: ${{ runner.name }}
-          script: ${{ matrix.script }}
-          timeout: ${{ matrix.timeout || 10 }}
-          image: emerging_optimizers
           cpu-only: ${{ matrix.cpu-only || false }}
           has-azure-credentials: "true"
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -141,7 +87,6 @@ jobs:
     needs:
       - cicd-container-build
       - cicd-unit-tests
-      - cicd-e2e-tests
     if: always()
     runs-on: ubuntu-latest
     permissions: write-all
@@ -240,7 +185,7 @@ jobs:
     needs: [Nemo_CICD_Test]
     strategy:
       matrix:
-        flag: [unit-test, e2e]
+        flag: [unit-test]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -263,13 +208,12 @@ jobs:
           rm -rf coverage-*
           ls -al
 
-      # Disabled for new repos initially
-      # - name: Upload coverage reports to Codecov
-      #   uses: codecov/codecov-action@v5
-      #   with:
-      #     token: ${{ secrets.CODECOV_TOKEN }}
-      #     verbose: true
-      #     flags: ${{ matrix.flag }}
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
+          flags: ${{ matrix.flag }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4