diff --git a/.drone.yml b/.drone.yml
index 355574857..6b7034326 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -580,7 +580,7 @@ steps:
       event: [ push, tag, pull_request ]
 
   - name: before-static-build
-    image: techknowlogick/xgo:go-1.23.x
+    image: ghcr.io/techknowlogick/xgo:go-1.23.x
     pull: always
     commands:
       - export PATH=$PATH:$GOPATH/bin
@@ -589,7 +589,7 @@ steps:
     depends_on: [ fetch-tags, mage ]
 
   - name: static-build-windows
-    image: techknowlogick/xgo:go-1.23.x
+    image: ghcr.io/techknowlogick/xgo:go-1.23.x
     pull: always
     environment:
       # This path does not exist. However, when we set the gopath to /go, the build fails. Not sure why.
@@ -605,7 +605,7 @@ steps:
       - frontend-build
 
   - name: static-build-linux
-    image: techknowlogick/xgo:go-1.23.x
+    image: ghcr.io/techknowlogick/xgo:go-1.23.x
     pull: always
     environment:
       # This path does not exist. However, when we set the gopath to /go, the build fails. Not sure why.
@@ -621,7 +621,7 @@ steps:
       - frontend-build
 
   - name: static-build-darwin
-    image: techknowlogick/xgo:go-1.23.x
+    image: ghcr.io/techknowlogick/xgo:go-1.23.x
     pull: always
     environment:
       # This path does not exist. However, when we set the gopath to /go, the build fails. Not sure why.
@@ -647,7 +647,7 @@ steps:
       - ./mage-static release:compress
 
   - name: after-build-static
-    image: techknowlogick/xgo:go-1.23.x
+    image: ghcr.io/techknowlogick/xgo:go-1.23.x
     pull: always
     depends_on:
       - after-build-compress
@@ -1352,6 +1352,6 @@ steps:
         - failure
 ---
 kind: signature
-hmac: 14968b058e6d28fa78d2329672bb46b401822543171ca4bf524ec5f7ed7fa443
+hmac: e9c8b5dbbacec2777908d70408995135dfab758c01378c130f78ae21b9c2e644
 
 ...
diff --git a/Dockerfile b/Dockerfile
index 756f02d9f..72b1e7ac4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN corepack enable && \
       pnpm install && \
       pnpm run build
 
-FROM --platform=$BUILDPLATFORM techknowlogick/xgo:go-1.23.x AS apibuilder
+FROM --platform=$BUILDPLATFORM ghcr.io/techknowlogick/xgo:go-1.23.x AS apibuilder
 
 RUN go install github.com/magefile/mage@latest && \
     mv /go/bin/mage /usr/local/go/bin
diff --git a/magefile.go b/magefile.go
index 7548c5acf..ce53e0eb4 100644
--- a/magefile.go
+++ b/magefile.go
@@ -547,7 +547,19 @@ func (Release) Windows() error {
 
 // Builds binaries for linux
 func (Release) Linux() error {
-	return runXgo("linux/*")
+	targets := []string{
+		"linux/amd64",
+		"linux/arm-5",
+		"linux/arm-6",
+		"linux/arm-7",
+		"linux/arm64",
+		"linux/mips",
+		"linux/mipsle",
+		"linux/mips64",
+		"linux/mips64le",
+		"linux/riscv64",
+	}
+	return runXgo(strings.Join(targets, ","))
 }
 
 // Builds binaries for darwin