diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9c3f745f..368c74b6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,6 +43,7 @@ jobs:
           - Pharo32-stable
           - Pharo32-alpha
           - Pharo32-3.0
+          - Moose64-12
           - Moose64-11
           - Moose64-10
           - Moose64-9.0
diff --git a/README.md b/README.md
index 179b5444..804cd02e 100644
--- a/README.md
+++ b/README.md
@@ -75,15 +75,15 @@ they can take up a lot of space on your drive.*
 | [Squeak][squeak] | [Pharo][pharo]   | [GemStone][gemstone] | [Moose][moose]  | [GToolkit][gtoolkit] |
 | ---------------- | ---------------- | -------------------- | --------------- | -------------------- |
 | `Squeak64-trunk` | `Pharo64-alpha`  | `GemStone64-3.6.x`   | `Moose64-trunk` | `GToolkit64-release` |
-| `Squeak64-6.0`   | `Pharo64-stable` | `GemStone64-3.5.8`   | `Moose64-11`    |                      |
-| `Squeak64-5.3`   | `Pharo64-13`     | `GemStone64-3.5.7`   | `Moose64-10`    |                      |
-| `Squeak64-5.2`   | `Pharo64-12`     | `GemStone64-3.5.6`   | `Moose64-9.0`   |                      |
-| `Squeak64-5.1`   | `Pharo64-11`     | `GemStone64-3.5.5`   | `Moose64-8.0`   |                      |
-| `Squeak32-trunk` | `Pharo64-10`     | `Gemstone64-3.5.4`   | `Moose64-7.0`   |                      |
-| `Squeak32-6.0`   | `Pharo64-9.0`    | `GemStone64-3.5.3`   | `Moose32-trunk` |                      |
-| `Squeak32-5.3`   | `Pharo64-8.0`    |                      | `Moose32-6.1`   |                      |
-| `Squeak32-5.2`   | `Pharo64-7.0`    |                      | `Moose32-6.0`   |                      |
-| `Squeak32-5.1`   | `Pharo64-6.1`    |                      |                 |                      |
+| `Squeak64-6.0`   | `Pharo64-stable` | `GemStone64-3.5.8`   | `Moose64-12`    |                      |
+| `Squeak64-5.3`   | `Pharo64-13`     | `GemStone64-3.5.7`   | `Moose64-11`    |                      |
+| `Squeak64-5.2`   | `Pharo64-12`     | `GemStone64-3.5.6`   | `Moose64-10`   |                      |
+| `Squeak64-5.1`   | `Pharo64-11`     | `GemStone64-3.5.5`   | `Moose64-9.0`   |                      |
+| `Squeak32-trunk` | `Pharo64-10`     | `Gemstone64-3.5.4`   | `Moose64-8.0`   |                      |
+| `Squeak32-6.0`   | `Pharo64-9.0`    | `GemStone64-3.5.3`   | `Moose64-7.0`   |                      |
+| `Squeak32-5.3`   | `Pharo64-8.0`    |                      | `Moose32-trunk` |                      |
+| `Squeak32-5.2`   | `Pharo64-7.0`    |                      | `Moose32-6.1`   |                      |
+| `Squeak32-5.1`   | `Pharo64-6.1`    |                      | `Moose32-6.0`   |                      |                |                      |
 | `Squeak32-5.0`   | `Pharo64-6.0`    |                      |                 |                      |
 | `Squeak32-4.6`   | `Pharo32-alpha`  |                      |                 |                      |
 | `Squeak32-4.5`   | `Pharo32-stable` |                      |                 |                      |
diff --git a/pharo/run.sh b/pharo/run.sh
index 72a93436..669b2aef 100644
--- a/pharo/run.sh
+++ b/pharo/run.sh
@@ -109,7 +109,7 @@ moose::get_image_url() {
 
   case "${smalltalk_name}" in
     "Moose64-trunk"|"Moose-trunk")
-      echo "https://github.com/moosetechnology/Moose/releases/download/continuous/Moose11-development-Pharo64-11.zip"
+      echo "https://github.com/moosetechnology/Moose/releases/download/continuous/Moose12-development-Pharo64-12.zip"
       ;;
     "Moose32-trunk")
       moose_name="moose-7.0"
@@ -133,7 +133,10 @@ moose::get_image_url() {
       echo "https://github.com/moosetechnology/Moose/releases/download/v10.x.x/Moose10-stable-Pharo64-10.zip"
       ;;
     "Moose64-11"*)
-      echo "https://github.com/moosetechnology/Moose/releases/download/continuous/Moose11-development-Pharo64-11.zip"
+      echo "https://github.com/moosetechnology/Moose/releases/download/v11.x.x/Moose11-stable-Pharo64-11.zip"
+      ;;
+    "Moose64-12"*)
+      echo "https://github.com/moosetechnology/Moose/releases/download/continuous/Moose12-development-Pharo64-12.zip"
       ;;
     *)
       print_error_and_exit "Unsupported Moose version '${smalltalk_name}'."
@@ -165,10 +168,10 @@ pharo::get_vm_url() {
     "Pharo64-13")
       echo "get.pharo.org/64/vm130"
       ;;
-    "Pharo64-12")
+    "Pharo64-12"|"Moose64-12"|"Moose64-trunk")
       echo "get.pharo.org/64/vm120"
       ;;
-    "Pharo64-11"|"Moose64-11"|"Moose64-trunk")
+    "Pharo64-11"|"Moose64-11")
       echo "get.pharo.org/64/vm110"
       ;;
     "Pharo64-10"|"Moose64-10")
diff --git a/run.sh b/run.sh
index caf45d02..5555c252 100755
--- a/run.sh
+++ b/run.sh
@@ -228,7 +228,7 @@ select_smalltalk() {
                 Pharo32-4.0 Pharo32-3.0
                 GemStone64-3.6.5 GemStone64-3.6.0 GemStone64-3.5.8 GemStone64-3.5.3
                 GToolkit64-release
-                Moose64-trunk Moose64-10 Moose64-9.0 Moose64-8.0 Moose64-7.0
+                Moose64-trunk Moose64-12 Moose64-11 Moose64-10 Moose64-9.0 Moose64-8.0 Moose64-7.0
                 Moose32-trunk Moose32-8.0 Moose32-7.0 Moose32-6.1 Moose32-6.0"
 
   if is_not_empty "${config_smalltalk}"; then