diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8fd60df3b96..f36af54aaa7 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -32,11 +32,14 @@ env:
   E2E_BUILD_DIST_EMBER_NAME: dist_ember
   E2E_BUILD_DIST_EMBER_DIR: dist_ember
 
+  CONTAINER: registry.suse.com/bci/nodejs:20
+  RUNS_ON: org-${{ github.repository_owner_id }}-amd64-k8s
+
 jobs:
   e2e-ui-build:
     if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
-    container: ubuntu-latest
-    runs-on: org-${{ github.repository_owner_id }}-amd64-k8s
+    container: ${{env.CONTAINER}}
+    runs-on: ${{env.RUNS_ON}}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -139,8 +142,8 @@ jobs:
   #         path: cypress/screenshots
 
   unit-test:
-    container: ubuntu-latest
-    runs-on: org-${{ github.repository_owner_id }}-amd64-k8s
+    container: ${{env.CONTAINER}}
+    runs-on: ${{env.RUNS_ON}}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -162,8 +165,8 @@ jobs:
           path: coverage-artifacts/**/*
 
   i18n:
-    container: ubuntu-latest
-    runs-on: org-${{ github.repository_owner_id }}-amd64-k8s
+    container: ${{env.CONTAINER}}
+    runs-on: ${{env.RUNS_ON}}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -173,8 +176,8 @@ jobs:
         uses: ./.github/actions/i18n-lint
 
   lint:
-    container: ubuntu-latest
-    runs-on: org-${{ github.repository_owner_id }}-amd64-k8s
+    container: ${{env.CONTAINER}}
+    runs-on: ${{env.RUNS_ON}}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -184,8 +187,8 @@ jobs:
         uses: ./.github/actions/lint
       
   check-i18n:
-    container: ubuntu-latest
-    runs-on: org-${{ github.repository_owner_id }}-amd64-k8s
+    container: ${{env.CONTAINER}}
+    runs-on: ${{env.RUNS_ON}}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -202,39 +205,40 @@ jobs:
           # Falure won't fail the job (remove -x when all current issues are fixed)
           ./scripts/check-i18n -s -x
 
-  # # coverage:
-  # #   runs-on: ubuntu-latest
-  # #   needs:
-  # #     - unit-test
-  # #   steps:
-  # #     - uses: actions/checkout@v3
-  # #       with:
-  # #         fetch-depth: 1
-
-  # #     - uses: actions/setup-node@v4
-  # #       with:
-  # #         node-version-file: '.nvmrc'
-
-  # #     - name: Download Coverage Artifacts
-  # #       uses: actions/download-artifact@v3
-  # #       with:
-  # #         name: ${{github.run_number}}-${{github.run_attempt}}-coverage
-
-  # #     - name: Install Codecov CLI
-  # #       run : .github/workflows/scripts/install-codecov.sh
-
-  # #     - name: Upload tests coverage report to Codecov
-  # #       run: ./codecov --verbose upload-process -t ${{ secrets.CODECOV_TOKEN }} -n ${{github.run_number}}-${{github.run_attempt}}-coverage -F unit -f ./coverage/coverage-unit.json
-
-  # check-e2e-tags:
+  # coverage:
   #   runs-on: ubuntu-latest
+  #   needs:
+  #     - unit-test
   #   steps:
-  #     - uses: actions/checkout@v4
+  #     - uses: actions/checkout@v3
   #       with:
   #         fetch-depth: 1
+
   #     - uses: actions/setup-node@v4
   #       with:
   #         node-version-file: '.nvmrc'
-  #     - name: Check e2e tags
-  #       run: |
-  #         ./scripts/check-e2e-tests-for-tags
+
+  #     - name: Download Coverage Artifacts
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: ${{github.run_number}}-${{github.run_attempt}}-coverage
+
+  #     - name: Install Codecov CLI
+  #       run : .github/workflows/scripts/install-codecov.sh
+
+  #     - name: Upload tests coverage report to Codecov
+  #       run: ./codecov --verbose upload-process -t ${{ secrets.CODECOV_TOKEN }} -n ${{github.run_number}}-${{github.run_attempt}}-coverage -F unit -f ./coverage/coverage-unit.json
+
+  check-e2e-tags:
+    container: ${{env.CONTAINER}}
+    runs-on: ${{env.RUNS_ON}}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - name: Check e2e tags
+        run: |
+          ./scripts/check-e2e-tests-for-tags