diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 74bef4c10..c4bc40352 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
         type: string
 
 env:
-  LOWEST_SUPPORTED_UNITY_VERSION: 2020
+  LOWEST_SUPPORTED_UNITY_VERSION: 2020.3
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_NOLOGO: 1
   GITHUB_ACTOR: ${{ github.actor }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b56c5bab8..12a563791 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch: # e.g. to manually trigger on foreign PRs
 
 env:
-  LOWEST_SUPPORTED_UNITY_VERSION: 2020
+  LOWEST_SUPPORTED_UNITY_VERSION: 2020.3
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_NOLOGO: 1
 
@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         # Building the SDK with Unity 2022 and newer requires ns2.1 - skipping for now
-        unity-version: ["2020", "2021"]
+        unity-version: ["2020.3", "2021.3"]
     uses: ./.github/workflows/build.yml
     with:
       unity-version: ${{ matrix.unity-version }}
@@ -87,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000", "6100"]
+        unity-version: ["2020.3", "2022.3", "6000.0", "6000.1"]
     uses: ./.github/workflows/smoke-test-create.yml
     with:
       unity-version: ${{ matrix.unity-version }}
@@ -101,7 +101,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000", "6100"]
+        unity-version: ["2020.3", "2022.3", "6000.0", "6000.1"]
         platform: ["WebGL", "Linux"]
         include:
           - platform: WebGL
@@ -205,7 +205,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000", "6100"]
+        unity-version: ["2020.3", "2022.3", "6000.0", "6000.1"]
     uses: ./.github/workflows/smoke-test-build-android.yml
     with:
       unity-version: ${{ matrix.unity-version }}
@@ -224,7 +224,7 @@ jobs:
       matrix:
         api-level: [30, 31, 34] # last updated January 2025
         init-type: ["runtime", "buildtime"]
-        unity-version: ["2020", "2022", "6000", "6100"]
+        unity-version: ["2020.3", "2022.3", "6000.0", "6000.1"]
 
   smoke-test-build-ios:
     name: Build iOS ${{ matrix.unity-version }} Smoke Test
@@ -234,7 +234,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000", "6100"]
+        unity-version: ["2020.3", "2022.3", "6000.0", "6000.1"]
     uses: ./.github/workflows/smoke-test-build-ios.yml
     with:
       unity-version: ${{ matrix.unity-version }}
@@ -247,7 +247,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000", "6100"]
+        unity-version: ["2020.3", "2022.3", "6000.0", "6000.1"]
         init-type: ["runtime", "buildtime"]
     uses: ./.github/workflows/smoke-test-compile-ios.yml
     with:
@@ -266,7 +266,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000", "6100"]
+        unity-version: ["2020.3", "2022.3", "6000.0", "6000.1"]
         # Check https://support.apple.com/en-us/HT201222 for the latest minor version for a given major one.
         # https://developer.apple.com/support/app-store/ shows that of all iOS devices
         # - `iOS 17`: 86 %
@@ -287,7 +287,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000", "6100"]
+        unity-version: ["2020.3", "2022.3", "6000.0", "6000.1"]
         platform: ["WebGL", "Linux"]
     steps:
       - name: Checkout
@@ -325,7 +325,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000", "6100"]
+        unity-version: ["2020.3", "2022.3", "6000.0", "6000.1"]
         # os: ["windows", "macos"]
         os: ["windows"]
         include:
diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml
index 47e42798c..ac992d43b 100644
--- a/.github/workflows/update-deps.yml
+++ b/.github/workflows/update-deps.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-prefix: ['2020', '2021', '2022', '6000']
+        unity-prefix: ['2020.3', '2021.3', '2022.3', '6000.0', '6000.1']
     steps:
       - name: Find the latest Unity version
         id: version-select
@@ -61,7 +61,7 @@ jobs:
           ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
 
       - name: Update sample ProjectVersion.txt
-        if: ${{ matrix.unity-prefix == '2020' }}
+        if: ${{ matrix.unity-prefix == '2020.3' }}
         run: |
           "m_EditorVersion: ${{ steps.version-select.outputs.version }}`nm_EditorVersionWithRevision: ${{ steps.version-select.outputs.version }} (${{ steps.version-select.outputs.changeset }})" `
             | Out-File "samples\unity-of-bugs\ProjectSettings\ProjectVersion.txt"
@@ -69,7 +69,7 @@ jobs:
       - name: Update ci-env.ps1
         run: |
           $file = "scripts/ci-env.ps1"
-          $regexVersion = '${{ matrix.unity-prefix }}' + "[0-9.a-z]+"
+          $regexVersion = '${{ matrix.unity-prefix }}' + "\.[0-9]+[a-z][0-9]+"
           echo "Regex: $regexVersion"
           (Get-Content $file) -replace $regexVersion, '${{ steps.version-select.outputs.version }}' | Out-File $file
 
diff --git a/scripts/ci-env.ps1 b/scripts/ci-env.ps1
index a541243f3..1e8ae66d8 100644
--- a/scripts/ci-env.ps1
+++ b/scripts/ci-env.ps1
@@ -4,22 +4,19 @@ param (
 )
 
 switch ($name) {
-    "unity2020" {
+    "unity2020.3" {
         return "2020.3.48f1"
     }
-    "unity2021" {
+    "unity2021.3" {
         return "2021.3.45f1"
     }
-    "unity2022" {
+    "unity2022.3" {
         return "2022.3.62f1"
     }
-    "unity2023" {
-        return "2023.2.20f1"
+    "unity6000.0" {
+        return "6000.0.54f1"
     }
-    "unity6000" {
-        return "6000.0.49f1"
-    }
-    "unity6100" {
+    "unity6000.1" {
         return "6000.1.12f1"
     }
     Default {