diff --git a/.github/scripts/set-env.sh b/.github/scripts/set-env.sh
index 5ef6ba3354f..8bc8a08c964 100755
--- a/.github/scripts/set-env.sh
+++ b/.github/scripts/set-env.sh
@@ -2,8 +2,8 @@
  
 set -ex
 
-echo "$JAVA_HOME_8_X64/bin" >> $GITHUB_PATH
-echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV
+# echo "$JAVA_HOME_8_X64/bin" >> $GITHUB_PATH
+# echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV
 
 NEW_RELEASE_VERSION_EXISTS=0
 if [ "$GITHUB_REF" == "refs/heads/main" ]; then
diff --git a/.github/scripts/show-env.sh b/.github/scripts/show-env.sh
index a998134aaf9..3c98521eed4 100755
--- a/.github/scripts/show-env.sh
+++ b/.github/scripts/show-env.sh
@@ -2,7 +2,7 @@
  
 set -e
 
-grep VERSION_NAME $BASEDIR/gradle.properties
+# grep VERSION_NAME $BASEDIR/gradle.properties
 echo "LATEST_PUBLISHED_VERSION: $LATEST_PUBLISHED_VERSION"
 echo "RELEASE_VERSION: $RELEASE_VERSION"
 echo "NEW_RELEASE_VERSION_EXISTS: $NEW_RELEASE_VERSION_EXISTS"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index daad2b3e544..445be74ef70 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -19,7 +19,7 @@ env:
   GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=false -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
 
 jobs:
-  publish_js_commons:
+  publish_linux_jvm_js_and_commons:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -35,38 +35,14 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-            ~/.gradle/yarn
-            ~/.gradle/nodejs
-          key: js-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+            ~/.konan
+          key: linux-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            js-step-gradle-
+            linux-step-gradle-
 
       - name: Publish commons
         working-directory: arrow-libs
         run: ./gradlew publishKotlinMultiplatformPublicationToMavenRepository
-      - name: Publish js
-        working-directory: arrow-libs
-        run: ./gradlew publishJsPublicationToMavenRepository
-  publish_linux_and_jvm:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Restore Gradle cache
-        id: cache
-        uses: actions/cache@v2.1.6
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.konan
-          key: linux-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            linux-step-gradle-
 
       - name: Publish LinuxX64
         working-directory: arrow-libs
@@ -76,6 +52,10 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishJvmPublicationToMavenRepository
 
+      - name: Publish Js
+        working-directory: arrow-libs
+        run: ./gradlew publishJsPublicationToMavenRepository
+
   publish_macos_and_ios:
     runs-on: macos-latest
     timeout-minutes: 20
@@ -123,7 +103,7 @@ jobs:
 
   publish_tvos_and_watchos:
     runs-on: macos-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -138,9 +118,9 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.konan
-          key: tv-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: tv-watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            tv-step-gradle-
+            tv-watchos-step-gradle-
 
       - name: Publish tvos Arm64
         working-directory: arrow-libs
@@ -166,15 +146,10 @@ jobs:
         working-directory: arrow-libs
         run: ./gradlew publishWatchosArm32PublicationToMavenRepository
 
-      - name: Publish watchosArm64
-        working-directory: arrow-libs
-        run: ./gradlew publishWatchosArm64PublicationToMavenRepository
-
       - name: Publish watchosSimulatorArm64
         working-directory: arrow-libs
         run: ./gradlew publishWatchosSimulatorArm64PublicationToMavenRepository
 
-
   publish_windows:
     runs-on: windows-latest
     timeout-minutes: 20
@@ -199,8 +174,8 @@ jobs:
       - name: Publish MingwX64
         working-directory: arrow-libs
         run: ./gradlew publishMingwX64PublicationToMavenRepository
-  publish-arrow-stack:
 
+  publish-arrow-stack:
     runs-on: macos-latest
     defaults:
       run:
@@ -212,9 +187,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: "Setup"
-        run: brew install grep
-
       - name: "Set env"
         run: ${GITHUB_WORKSPACE}/.github/scripts/set-env.sh
 
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 837c556e289..f6780af9dd3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -51,50 +51,10 @@ jobs:
       - name: "Validate documentation"
         working-directory: arrow-site
         run: ./gradlew runAnk
-  js:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Restore Gradle cache
-        id: cache
-        uses: actions/cache@v2.1.6
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.gradle/yarn
-            ~/.gradle/nodejs
-          key: js-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            js-step-gradle-
-
-      - name: Build
-        working-directory: arrow-libs
-        run: ./gradlew jsTest
 
-      - name: "Prepare test reports"
-        if: ${{ always() }}
-        run: |
-          mkdir test-reports
-          for report in `ls -d arrow-libs/**/**/build/reports/tests`; do
-            module=$(echo $report | cut -d/ -f3)
-            cp -r $report test-reports/$module
-          done
-
-      - name: "Make test reports available to download"
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v1
-        with:
-          name: test-reports
-          path: test-reports
-  linux_and_jvm:
+  linux_jvm_and_js:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 25
 
     steps:
       - uses: actions/checkout@v2
@@ -115,7 +75,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew linuxX64Test jvmTest
+        run: ./gradlew linuxX64Test jvmTest jsTest
 
       - name: "Prepare test reports"
         if: ${{ always() }}
@@ -132,6 +92,7 @@ jobs:
         with:
           name: test-reports
           path: test-reports
+
   macos_and_ios:
     runs-on: macos-latest
     timeout-minutes: 20
@@ -155,7 +116,7 @@ jobs:
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew macosX64Test iosX64Test
+        run: ./gradlew macosX64Test iosX64Test macosArm64Test iosSimulatorArm64Test iosArm64TestBinaries iosArm64TestKlibrary iosArm32TestBinaries iosArm32TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}
@@ -172,9 +133,10 @@ jobs:
         with:
           name: test-reports
           path: test-reports
-  tvos_and_watchos:
+
+  tv_and_watchos:
     runs-on: macos-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v2
@@ -189,13 +151,13 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.konan
-          key: tv-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: tv-watchos-step-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            tv-step-gradle-
+            tv-watch-os-step-gradle-
 
       - name: Build
         working-directory: arrow-libs
-        run: ./gradlew tvosX64Test watchosX64Test
+        run: ./gradlew watchosX64Test watchosX86Test watchosSimulatorArm64Test watchosArm32TestBinaries watchosArm32TestKlibrary tvosX64Test tvosSimulatorArm64Test tvosArm64TestBinaries tvosArm64TestKlibrary
 
       - name: "Prepare test reports"
         if: ${{ always() }}
@@ -212,6 +174,7 @@ jobs:
         with:
           name: test-reports
           path: test-reports
+
   windows:
     runs-on: windows-latest
     timeout-minutes: 20
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/iosArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/iosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/iosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/iosX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/iosX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/iosX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/linuxX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/linuxX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/linuxX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/macosX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/macosX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/macosX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/mingwX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/mingwX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/mingwX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/iosArm32Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/nativeMain/kotlin/arrow/fx/coroutines/predef.kt
similarity index 100%
rename from arrow-libs/fx/arrow-fx-coroutines/src/iosArm32Main/kotlin/arrow/fx/coroutines/predef.kt
rename to arrow-libs/fx/arrow-fx-coroutines/src/nativeMain/kotlin/arrow/fx/coroutines/predef.kt
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/tvosMain/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/tvosMain/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/tvosMain/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm32Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm32Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm32Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/watchosArm64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosX64Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosX64Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/watchosX64Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/watchosX86Main/kotlin/arrow/fx/coroutines/predef.kt b/arrow-libs/fx/arrow-fx-coroutines/src/watchosX86Main/kotlin/arrow/fx/coroutines/predef.kt
deleted file mode 100644
index 96685114130..00000000000
--- a/arrow-libs/fx/arrow-fx-coroutines/src/watchosX86Main/kotlin/arrow/fx/coroutines/predef.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package arrow.fx.coroutines
-
-import kotlin.system.getTimeMillis
-
-public actual fun timeInMillis(): Long =
-  getTimeMillis()
diff --git a/arrow-libs/gradle/subproject-mpp.gradle b/arrow-libs/gradle/subproject-mpp.gradle
index 18259fbd5a2..d3caedbc338 100644
--- a/arrow-libs/gradle/subproject-mpp.gradle
+++ b/arrow-libs/gradle/subproject-mpp.gradle
@@ -36,7 +36,6 @@ kotlin {
     tvosSimulatorArm64()
 
     watchosArm32()
-    watchosArm64()
     watchosX86()
     watchosX64()
     watchosSimulatorArm64()
@@ -87,7 +86,6 @@ kotlin {
             iosSimulatorArm64Main.dependsOn(it)
             watchosX86Main.dependsOn(it)
             watchosArm32Main.dependsOn(it)
-            watchosArm64Main.dependsOn(it)
             watchosX64Main.dependsOn(it)
             watchosSimulatorArm64Main.dependsOn(it)
             tvosMain.dependsOn(it)
@@ -105,7 +103,6 @@ kotlin {
             iosSimulatorArm64Test.dependsOn(it)
             watchosX86Test.dependsOn(it)
             watchosArm32Test.dependsOn(it)
-            watchosArm64Test.dependsOn(it)
             watchosX64Test.dependsOn(it)
             watchosSimulatorArm64Test.dependsOn(it)
             tvosTest.dependsOn(it)