diff --git a/.ci.main-container.sh b/.ci.container.sh
similarity index 100%
rename from .ci.main-container.sh
rename to .ci.container.sh
diff --git a/.github/workflows.src/main.yml b/.github/workflows.src/main.yml
index dade5962e..55ae4eb35 100644
--- a/.github/workflows.src/main.yml
+++ b/.github/workflows.src/main.yml
@@ -131,7 +131,7 @@ jobs:
 
 # ------------------------------------------------------------------------------
 
-  main-container:
+  container:
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -149,11 +149,11 @@ jobs:
         sf_ci_brew_install:
           - minimal
           - dev
-    name: main-container-${{ matrix.container }}-${{ matrix.sf_ci_brew_install }}
+    name: container-${{ matrix.container }}-${{ matrix.sf_ci_brew_install }}
     runs-on: ubuntu-latest
     env:
       <<: *env
-      GITHUB_JOB_NAME: main-container-${{ matrix.container }}-${{ matrix.sf_ci_brew_install }}
+      GITHUB_JOB_NAME: container-${{ matrix.container }}-${{ matrix.sf_ci_brew_install }}
       GITHUB_MATRIX_CONTAINER: ${{ matrix.container }}
       GITHUB_MATRIX_SF_CI_BREW_INSTALL: ${{ matrix.sf_ci_brew_install }}
       SF_CI_BREW_INSTALL: minimal
@@ -171,11 +171,11 @@ jobs:
         sf_ci_brew_install:
           - minimal
           # - dev # too time consuming
-    name: main-windows-${{ matrix.os }}-${{ matrix.sf_ci_brew_install }}
+    name: main-${{ matrix.os }}-${{ matrix.sf_ci_brew_install }}
     runs-on: ${{ matrix.os }}
     env:
       <<: *env
-      GITHUB_JOB_NAME: main-windows-${{ matrix.os }}-${{ matrix.sf_ci_brew_install }}
+      GITHUB_JOB_NAME: main-${{ matrix.os }}-${{ matrix.sf_ci_brew_install }}
       SF_CI_BREW_INSTALL: ${{ matrix.sf_ci_brew_install }}
       WSLENV: '${ENVSUBST_WSLENV}'
       WSLUSER: github