diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26180ab..422755c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,7 +239,7 @@ test:linux:recommended:armv7:
   stage: test
   extends: .test_ghcup_version:armv7
   variables:
-    GHC_VERSION: "8.10.5"
+    GHC_VERSION: "8.10.4"
     CABAL_VERSION: "3.4.0.0"
   when: manual
   needs: []
@@ -248,7 +248,7 @@ test:linux:recommended:aarch64:
   stage: test
   extends: .test_ghcup_version:aarch64
   variables:
-    GHC_VERSION: "8.10.5"
+    GHC_VERSION: "8.10.4"
     CABAL_VERSION: "3.4.0.0"
   when: manual
   needs: []
@@ -259,7 +259,7 @@ test:mac:recommended:
   stage: test
   extends: .test_ghcup_version:darwin
   variables:
-    GHC_VERSION: "8.10.5"
+    GHC_VERSION: "8.10.4"
     CABAL_VERSION: "3.4.0.0"
   needs: []
 
@@ -286,7 +286,7 @@ test:freebsd:recommended:
   stage: test
   extends: .test_ghcup_version:freebsd
   variables:
-    GHC_VERSION: "8.10.5"
+    GHC_VERSION: "8.10.4"
     CABAL_VERSION: "3.4.0.0"
   allow_failure: true # freebsd runners are unreliable
   when: manual
@@ -341,7 +341,7 @@ release:linux:armv7:
     - ./.gitlab/before_script/linux/install_deps_manual.sh
   variables:
     ARTIFACT: "armv7-linux-ghcup"
-    GHC_VERSION: "8.10.5"
+    GHC_VERSION: "8.10.4"
     CABAL_VERSION: "3.4.0.0"
 
 release:linux:aarch64:
@@ -354,7 +354,7 @@ release:linux:aarch64:
     - ./.gitlab/before_script/linux/install_deps_manual.sh
   variables:
     ARTIFACT: "aarch64-linux-ghcup"
-    GHC_VERSION: "8.10.5"
+    GHC_VERSION: "8.10.4"
     CABAL_VERSION: "3.4.0.0"
 
 ######## darwin release ########
@@ -374,6 +374,21 @@ release:darwin:
     CABAL_VERSION: "3.4.0.0"
     MACOSX_DEPLOYMENT_TARGET: "10.7"
 
+release:darwin:aarch64:
+  stage: release
+  needs: ["test:mac:recommended:aarch64"]
+  extends:
+    - .darwin:aarch64
+    - .release_ghcup
+    - .root_cleanup
+  before_script:
+    - ./.gitlab/before_script/darwin/install_deps.sh
+  variables:
+    ARTIFACT: "aarch64-apple-darwin-ghcup"
+    GHC_VERSION: "8.10.5"
+    CABAL_VERSION: "3.4.0.0"
+    MACOSX_DEPLOYMENT_TARGET: "10.7"
+
 
 ######## freebsd release ########
 
diff --git a/.gitlab/script/ghcup_version.sh b/.gitlab/script/ghcup_version.sh
index a3d57b7..05823a6 100755
--- a/.gitlab/script/ghcup_version.sh
+++ b/.gitlab/script/ghcup_version.sh
@@ -60,15 +60,16 @@ else
 fi
 
 
-cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" .
-cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup-gen')" .
-
-cp ./ghcup "$CI_PROJECT_DIR"/.local/bin/ghcup
-cp ./ghcup-gen "$CI_PROJECT_DIR"/.local/bin/ghcup-gen
+cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" "$CI_PROJECT_DIR"/.local/bin/ghcup
+cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup-gen')" "$CI_PROJECT_DIR"/.local/bin/ghcup-gen
 
 ### cleanup
 
-rm -rf "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup
+if [ "${OS}" = "WINDOWS" ] ; then
+	rm -rf "${GHCUP_INSTALL_BASE_PREFIX}"/ghcup
+else
+	rm -rf "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup
+fi
 
 
 ### manual cli based testing
@@ -92,9 +93,11 @@ eghcup list -t cabal
 
 ghc_ver=$(ghc --numeric-version)
 ghc --version
-ghci --version
-ghc-$(ghc --numeric-version) --version
-ghci-$(ghc --numeric-version) --version
+ghc-${ghc_ver} --version
+if [ "${OS}" != "WINDOWS" ] ; then
+		ghci --version
+		ghci-${ghc_ver} --version
+fi
 
 
 # test installing new ghc doesn't mess with currently set GHC