diff --git a/buildSrc/src/main/kotlin/CacheRedirector.kt b/buildSrc/src/main/kotlin/CacheRedirector.kt
index 084ffe7d74..85e6eef840 100644
--- a/buildSrc/src/main/kotlin/CacheRedirector.kt
+++ b/buildSrc/src/main/kotlin/CacheRedirector.kt
@@ -108,8 +108,8 @@ private fun Project.configureYarnAndNodeRedirects() {
         }
 
         val nodeJsExtension = rootProject.extensions.findByType<NodeJsRootExtension>()
-        nodeJsExtension?.nodeDownloadBaseUrl?.let {
-            nodeJsExtension.nodeDownloadBaseUrl = CacheRedirector.maybeRedirect(it)
+        nodeJsExtension?.downloadBaseUrl?.let {
+            nodeJsExtension.downloadBaseUrl = CacheRedirector.maybeRedirect(it)
         }
     }
 }
diff --git a/buildSrc/src/main/kotlin/atomicfu-conventions.gradle.kts b/buildSrc/src/main/kotlin/atomicfu-conventions.gradle.kts
deleted file mode 100644
index a499c8ceda..0000000000
--- a/buildSrc/src/main/kotlin/atomicfu-conventions.gradle.kts
+++ /dev/null
@@ -1,8 +0,0 @@
-plugins {
-    id("org.jetbrains.kotlinx.atomicfu")
-}
-
-// Workaround for KT-71203. Can be removed after https://github.com/Kotlin/kotlinx-atomicfu/issues/431
-atomicfu {
-    transformJs = false
-}
diff --git a/buildSrc/src/main/kotlin/configure-compilation-conventions.gradle.kts b/buildSrc/src/main/kotlin/configure-compilation-conventions.gradle.kts
index 27f3737021..26ee664c9c 100644
--- a/buildSrc/src/main/kotlin/configure-compilation-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/configure-compilation-conventions.gradle.kts
@@ -3,18 +3,15 @@ import org.jetbrains.kotlin.gradle.tasks.*
 configure(subprojects) {
     val project = this
     if (name in sourceless) return@configure
-    apply(plugin = "atomicfu-conventions")
+    apply(plugin = "org.jetbrains.kotlinx.atomicfu")
     tasks.withType<KotlinCompilationTask<*>>().configureEach {
         val isMainTaskName = name.startsWith("compileKotlin")
         compilerOptions {
-            var versionsAreNotOverridden = true
             getOverriddenKotlinLanguageVersion(project)?.let {
                 languageVersion = it
-                versionsAreNotOverridden = false
             }
             getOverriddenKotlinApiVersion(project)?.let {
                 apiVersion = it
-                versionsAreNotOverridden = false
             }
             if (isMainTaskName && !unpublished.contains(project.name)) {
                 allWarningsAsErrors = true
diff --git a/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts
index 273bf10300..e2e1e66e2d 100644
--- a/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts
@@ -14,8 +14,8 @@ java {
 kotlin {
     jvm {
         compilations.all {
-            compilerOptions.configure {
-                jvmTarget = JvmTarget.JVM_1_8
+            compileTaskProvider.configure {
+                compilerOptions.jvmTarget = JvmTarget.JVM_1_8
             }
         }
     }
@@ -53,7 +53,7 @@ kotlin {
             api("org.jetbrains.kotlinx:atomicfu-js:${version("atomicfu")}")
         }
     }
-    @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         // Module name should be different from the one from JS
         // otherwise IC tasks that start clashing different modules with the same module name
@@ -63,15 +63,17 @@ kotlin {
             api("org.jetbrains.kotlinx:atomicfu-wasm-js:${version("atomicfu")}")
         }
     }
-    @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmWasi {
         nodejs()
         compilations["main"]?.dependencies {
             api("org.jetbrains.kotlinx:atomicfu-wasm-wasi:${version("atomicfu")}")
         }
         compilations.configureEach {
-            compilerOptions.configure {
-                optIn.add("kotlin.wasm.internal.InternalWasmApi")
+            compileTaskProvider.configure {
+                compilerOptions {
+                    optIn.add("kotlin.wasm.internal.InternalWasmApi")
+                }
             }
         }
     }