diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 9f4dd8ed..44c29c7e 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -295,8 +295,8 @@ val getBinaries = if (binariesAreProvided) {
     val cmakeJvmBuilds = when {
         crossArch -> listOfNotNull(aarch64, x64)
         arch == "aarch64" -> listOfNotNull(aarch64)
-        arch == "amd64" -> listOfNotNull(x64)
-        else -> error("Unknown architecture: $arch")
+        arch == "amd64" || arch == "x86_64" -> listOfNotNull(x64)
+        else -> error("Unsupported architecture: $arch")
     }
 
     tasks.register<Copy>("cmakeJvmBuild") {
@@ -327,8 +327,8 @@ val downloadPowersyncDesktopBinaries = tasks.register<Download>("downloadPowersy
         src(when {
             crossArch -> listOfNotNull(aarch64, x64)
             arch == "aarch64" -> listOfNotNull(aarch64)
-            arch == "amd64" -> listOfNotNull(x64)
-            else -> error("Unknown architecture: $arch")
+            arch == "amd64" || arch == "x86_64" -> listOfNotNull(x64)
+            else -> error("Unsupported architecture: $arch")
         })
     }
     dest(binariesFolder.map { it.dir("powersync") })
diff --git a/core/src/jvmMain/kotlin/com/powersync/ExtractLib.kt b/core/src/jvmMain/kotlin/com/powersync/ExtractLib.kt
index 021aa7d8..76f8915a 100644
--- a/core/src/jvmMain/kotlin/com/powersync/ExtractLib.kt
+++ b/core/src/jvmMain/kotlin/com/powersync/ExtractLib.kt
@@ -20,8 +20,8 @@ internal fun extractLib(fileName: String): Path {
     val arch =
         when (val sysArch = System.getProperty("os.arch")) {
             "aarch64" -> "aarch64"
-            "amd64" -> "x64"
-            else -> error("Unknown architecture: $sysArch")
+            "amd64", "x86_64" -> "x64"
+            else -> error("Unsupported architecture: $sysArch")
         }
 
     val path = "/$prefix${fileName}_$arch.$extension"