diff --git a/.github/release.yml b/.github/release.yml
index 91e1ce8ce946..559e27ee99b5 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -104,7 +104,7 @@ changelog:
       labels:
         - 'VSCode Extension'
 
-    - title: 'Maintanance'
+    - title: 'Maintenance'
       labels:
         - 'Code cleanup'
         - 'Upgrade Library'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c91e39cecebb..d4080c000342 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -671,12 +671,6 @@ jobs:
       - name: ide/libs.freemarker
         run: ant $OPTS -f ide/libs.freemarker test
 
-      - name: ide/git
-        run: .github/retry.sh ant $OPTS -f ide/git test-unit
-
-      - name: ide/libs.git
-        run: .github/retry.sh ant $OPTS -f ide/libs.git test
-
       - name: ide/libs.graalsdk
         run: ant $OPTS -f ide/libs.graalsdk test
 
@@ -755,15 +749,6 @@ jobs:
       - name: ide/utilities
         run: ant $OPTS -f ide/utilities test
 
-      - name: ide/versioning.masterfs
-        run: ant $OPTS -f ide/versioning.masterfs test
-
-      - name: ide/versioning.ui
-        run: ant $OPTS -f ide/versioning.ui test
-
-      - name: ide/versioning.util
-        run: ant $OPTS -f ide/versioning.util test
-
       - name: ide/web.common
         run: ant $OPTS -f ide/web.common test
 
@@ -2317,6 +2302,21 @@ jobs:
       - name: Setup Env
         run: echo "GIT_TEST_REPO=$HOME/git_test_repo" >> $GITHUB_ENV
 
+      - name: ide/git
+        run: .github/retry.sh ant $OPTS -f ide/git test-unit
+
+      - name: ide/libs.git
+        run: .github/retry.sh ant $OPTS -f ide/libs.git test
+
+      - name: ide/versioning.masterfs
+        run: ant $OPTS -f ide/versioning.masterfs test
+
+      - name: ide/versioning.ui
+        run: ant $OPTS -f ide/versioning.ui test
+
+      - name: ide/versioning.util
+        run: ant $OPTS -f ide/versioning.util test
+
       - name: ide/versioning.core
         run: ant $OPTS -f ide/versioning.core test-unit