diff --git a/.github/workflows/generate-alpha-tag.yaml b/.github/workflows/generate-alpha-tag.yaml
index acba478dc65..c1248deee11 100644
--- a/.github/workflows/generate-alpha-tag.yaml
+++ b/.github/workflows/generate-alpha-tag.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Gradle build
         uses: gradle/gradle-build-action@v2.2.0
         with:
-          arguments: --full-stacktrace assemble "-Psemver.stage=alpha"
+          arguments: --full-stacktrace build "-Psemver.stage=alpha"
 
       - name: Stop Gradle daemons
         run: ./gradlew --stop
diff --git a/.github/workflows/generate-tag.yaml b/.github/workflows/generate-tag.yaml
index 48b8ddc118d..b2a4724569c 100644
--- a/.github/workflows/generate-tag.yaml
+++ b/.github/workflows/generate-tag.yaml
@@ -47,7 +47,7 @@ jobs:
       - name: Gradle build
         uses: gradle/gradle-build-action@v2.2.0
         with:
-          arguments: --full-stacktrace assemble "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}"
+          arguments: --full-stacktrace build "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}"
 
       - name: Stop Gradle daemons
         run: ./gradlew --stop
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a4bbb6c8172..1eb32d496d2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Build
         uses: gradle/gradle-build-action@v2.2.0
         with:
-          arguments: assemble --full-stacktrace
+          arguments: assemble -Pkotlin.mpp.enableCompatibilityMetadataVariant=true --full-stacktrace
 
       - name: Get Arrow version
         id: version
@@ -65,7 +65,7 @@ jobs:
           contains(steps.version.outputs.arrow, 'beta') ||
           contains(steps.version.outputs.arrow, 'rc')
         with:
-          arguments: --full-stacktrace publishToSonatype closeAndReleaseSonatypeStagingRepository
+          arguments: --full-stacktrace -Pkotlin.mpp.enableCompatibilityMetadataVariant=true publishToSonatype closeAndReleaseSonatypeStagingRepository
 
       - name: Publish final version
         uses: gradle/gradle-build-action@v2.2.0
@@ -74,7 +74,7 @@ jobs:
           !contains(steps.version.outputs.arrow, 'beta') &&
           !contains(steps.version.outputs.arrow, 'rc')
         with:
-          arguments: --full-stacktrace publishToSonatype closeSonatypeStagingRepository
+          arguments: --full-stacktrace -Pkotlin.mpp.enableCompatibilityMetadataVariant=true publishToSonatype closeSonatypeStagingRepository
 
       - name: Prepare environment
         working-directory: arrow-site
@@ -87,7 +87,7 @@ jobs:
       - name: Create API doc
         uses: gradle/gradle-build-action@v2.2.0
         with:
-          arguments: --full-stacktrace dokkaGfm
+          arguments: --full-stacktrace -Pkotlin.mpp.enableCompatibilityMetadataVariant=true dokkaGfm
 
       - name: Build release directory (/docs)
         working-directory: arrow-site
@@ -160,4 +160,4 @@ jobs:
           path: arrow-libs/logs.
 
       - name: Stop Gradle daemons
-        run: ./gradlew --stop
+        run: ./gradlew -Pkotlin.mpp.enableCompatibilityMetadataVariant=true --stop
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index c69358c719c..7e4a57d67da 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -29,13 +29,13 @@ jobs:
         uses: gradle/gradle-build-action@v2.2.0
         if: matrix.os != 'windows-latest'
         with:
-          arguments: --full-stacktrace assemble
+          arguments: --full-stacktrace build
 
       - name: mingwX64Test
         uses: gradle/gradle-build-action@v2.2.0
         if: matrix.os == 'windows-latest'
         with:
-          arguments: --full-stacktrace assemble
+          arguments: --full-stacktrace mingwX64Test
 
       - name: Upload reports
         uses: actions/upload-artifact@v3.1.0
diff --git a/arrow-libs/core/arrow-continuations/build.gradle.kts b/arrow-libs/core/arrow-continuations/build.gradle.kts
index 9fa0d259abc..550219e33d4 100644
--- a/arrow-libs/core/arrow-continuations/build.gradle.kts
+++ b/arrow-libs/core/arrow-continuations/build.gradle.kts
@@ -15,7 +15,7 @@ val enableCompatibilityMetadataVariant =
 
 if (enableCompatibilityMetadataVariant) {
   tasks.withType<Test>().configureEach {
-    enabled = false
+    exclude("**/*")
   }
 }
 
diff --git a/arrow-libs/core/arrow-core-retrofit/build.gradle.kts b/arrow-libs/core/arrow-core-retrofit/build.gradle.kts
index bf04f2ebf9d..46ba73e1399 100644
--- a/arrow-libs/core/arrow-core-retrofit/build.gradle.kts
+++ b/arrow-libs/core/arrow-core-retrofit/build.gradle.kts
@@ -14,7 +14,7 @@ val enableCompatibilityMetadataVariant =
 
 if (enableCompatibilityMetadataVariant) {
   tasks.withType<Test>().configureEach {
-    enabled = false
+    exclude("**/*")
   }
 }
 
diff --git a/arrow-libs/core/arrow-core/build.gradle.kts b/arrow-libs/core/arrow-core/build.gradle.kts
index c4293a48df0..5c3541f2696 100644
--- a/arrow-libs/core/arrow-core/build.gradle.kts
+++ b/arrow-libs/core/arrow-core/build.gradle.kts
@@ -16,7 +16,7 @@ val enableCompatibilityMetadataVariant =
 
 if (enableCompatibilityMetadataVariant) {
   tasks.withType<Test>().configureEach {
-    enabled = false
+    exclude("**/*")
   }
 }
 
diff --git a/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts b/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts
index 98e0294437d..701e2c7d715 100644
--- a/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts
+++ b/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts
@@ -13,7 +13,7 @@ val enableCompatibilityMetadataVariant =
 
 if (enableCompatibilityMetadataVariant) {
   tasks.withType<Test>().configureEach {
-    enabled = false
+    exclude("**/*")
   }
 }
 
diff --git a/arrow-libs/fx/arrow-fx-stm/build.gradle.kts b/arrow-libs/fx/arrow-fx-stm/build.gradle.kts
index 6b649f9eb52..c720bc248e2 100644
--- a/arrow-libs/fx/arrow-fx-stm/build.gradle.kts
+++ b/arrow-libs/fx/arrow-fx-stm/build.gradle.kts
@@ -14,7 +14,7 @@ val enableCompatibilityMetadataVariant =
 
 if (enableCompatibilityMetadataVariant) {
   tasks.withType<Test>().configureEach {
-    enabled = false
+    exclude("**/*")
   }
 }
 
@@ -30,7 +30,7 @@ kotlin {
     if (!enableCompatibilityMetadataVariant) {
       commonTest {
         dependencies {
-          implementation(project(":arrow-coroutines-fx-test"))
+          implementation(project(":arrow-fx-coroutines-test"))
         }
       }
       jvmTest {
diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts b/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts
index 2dfcd1d41c8..a27f89fbead 100644
--- a/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts
+++ b/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts
@@ -17,7 +17,7 @@ val enableCompatibilityMetadataVariant =
 
 if (enableCompatibilityMetadataVariant) {
   tasks.withType<Test>().configureEach {
-    enabled = false
+    exclude("**/*")
   }
 }
 
diff --git a/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts b/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts
index 6f16c4a83b6..f03e1c83993 100644
--- a/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts
+++ b/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts
@@ -13,7 +13,7 @@ val enableCompatibilityMetadataVariant =
 
 if (enableCompatibilityMetadataVariant) {
   tasks.withType<Test>().configureEach {
-    enabled = false
+    exclude("**/*")
   }
 }
 
diff --git a/arrow-libs/optics/arrow-optics/build.gradle.kts b/arrow-libs/optics/arrow-optics/build.gradle.kts
index 6a5e552a6f3..194b92b561a 100644
--- a/arrow-libs/optics/arrow-optics/build.gradle.kts
+++ b/arrow-libs/optics/arrow-optics/build.gradle.kts
@@ -16,7 +16,7 @@ val enableCompatibilityMetadataVariant =
 
 if (enableCompatibilityMetadataVariant) {
   tasks.withType<Test>().configureEach {
-    enabled = false
+    exclude("**/*")
   }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 0f7b248abd4..ce01f1a4c52 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,7 +27,7 @@ kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreIncorrectDependencies=true
 kotlin.native.ignoreDisabledTargets=true
 kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.mpp.enableCompatibilityMetadataVariant=true
+kotlin.mpp.enableCompatibilityMetadataVariant=false
 # https://youtrack.jetbrains.com/issue/KT-45545#focus=Comments-27-4773544.0-0
 kapt.use.worker.api=false