diff --git a/internal/api/link_muslc.go b/internal/api/link_muslc.go
deleted file mode 100644
index ac807af24..000000000
--- a/internal/api/link_muslc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build linux && muslc && !sys_wasmvm
-
-package api
-
-// TODO: once we switch to builders 0018+, split this linking statement in x86_64 and arm64 like we do with the glibc case
-
-// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lwasmvm_muslc
-import "C"
diff --git a/internal/api/link_muslc_aarch64.go b/internal/api/link_muslc_aarch64.go
new file mode 100644
index 000000000..e3ab74aeb
--- /dev/null
+++ b/internal/api/link_muslc_aarch64.go
@@ -0,0 +1,6 @@
+//go:build linux && muslc && arm64 && !sys_wasmvm
+
+package api
+
+// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lwasmvm_muslc.aarch64
+import "C"
diff --git a/internal/api/link_muslc_x86_64.go b/internal/api/link_muslc_x86_64.go
new file mode 100644
index 000000000..58489509f
--- /dev/null
+++ b/internal/api/link_muslc_x86_64.go
@@ -0,0 +1,6 @@
+//go:build linux && muslc && amd64 && !sys_wasmvm
+
+package api
+
+// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lwasmvm_muslc.x86_64
+import "C"