diff --git a/.woodpecker/binaries.yml b/.woodpecker/binaries.yml
index c48a6e7f940..9b4d9ff5163 100644
--- a/.woodpecker/binaries.yml
+++ b/.woodpecker/binaries.yml
@@ -28,24 +28,24 @@ steps:
     commands:
       - go mod vendor
 
-#  cross-compile-server:
-#    group: build
-#    image: *xgo_image
-#    pull: true
-#    commands:
-#      - apt update
-#      - apt install -y tree
-#      - make cross-compile-server
-#    environment:
-#      PLATFORMS: linux|arm64/v8;linux|amd64;windows|amd64
-#      TAGS: bindata sqlite sqlite_unlock_notify netgo
-#      XGO_VERSION: *xgo_version
-#      TARGZ: '1'
-  dummy-compile-server:
-    image: bash
-    commands:
-      - mkdir -p dist/server/linux/amd64 dist/server/linux/arm64 dist/server/windows/amd64 dist/agent/linux/amd64 dist/agent/linux/arm dist/agent/linux/arm64 dist/cli/linux/amd64 dist/cli/linux/arm dist/cli/linux/arm64
-      - touch dist/server/linux/amd64/woodpecker-server dist/server/linux/arm64/woodpecker-server dist/server/windows/amd64/woodpecker-server.exe dist/cli/linux/amd64/woodpecker-cli dist/cli/linux/arm/woodpecker-cli dist/cli/linux/arm64/woodpecker-cli dist/agent/linux/amd64/woodpecker-agent dist/agent/linux/arm/woodpecker-agent dist/agent/linux/arm64/woodpecker-agent dist/woodpecker-server_linux_amd64.tar.gz dist/woodpecker-server_linux_arm64.tar.gz dist/woodpecker-server_windows_amd64.tar.gz
+ cross-compile-server:
+   group: build
+   image: *xgo_image
+   pull: true
+   commands:
+     - apt update
+     - apt install -y tree
+     - make cross-compile-server
+   environment:
+     PLATFORMS: linux|arm64/v8;linux|amd64;windows|amd64
+     TAGS: bindata sqlite sqlite_unlock_notify netgo
+     XGO_VERSION: *xgo_version
+     TARGZ: '1'
+  # dummy-compile-server:
+  #   image: bash
+  #   commands:
+  #     - mkdir -p dist/server/linux/amd64 dist/server/linux/arm64 dist/server/windows/amd64 dist/agent/linux/amd64 dist/agent/linux/arm dist/agent/linux/arm64 dist/cli/linux/amd64 dist/cli/linux/arm dist/cli/linux/arm64
+  #     - touch dist/server/linux/amd64/woodpecker-server dist/server/linux/arm64/woodpecker-server dist/server/windows/amd64/woodpecker-server.exe dist/cli/linux/amd64/woodpecker-cli dist/cli/linux/arm/woodpecker-cli dist/cli/linux/arm64/woodpecker-cli dist/agent/linux/amd64/woodpecker-agent dist/agent/linux/arm/woodpecker-agent dist/agent/linux/arm64/woodpecker-agent dist/woodpecker-server_linux_amd64.tar.gz dist/woodpecker-server_linux_arm64.tar.gz dist/woodpecker-server_windows_amd64.tar.gz
 
   build-agent:
     group: build
diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml
index 7486d45050d..4bdb4e303da 100644
--- a/.woodpecker/docker.yml
+++ b/.woodpecker/docker.yml
@@ -56,25 +56,25 @@ steps:
       - pnpm build
 
 # TODO: have an xgo arm image
-#  cross-compile-server-preview:
-#    image: *xgo_image
-#    pull: true
-#    commands:
-#      - apt update
-#      - apt install -y tree
-#      - make cross-compile-server
-#    environment:
-#      PLATFORMS: linux|amd64
-#      TAGS: bindata sqlite sqlite_unlock_notify netgo
-#      XGO_VERSION: *xgo_version
-#    when:
-#      event: pull_request
-  dummy-compile-server:
-    image: bash
-    commands:
-      - mkdir -p dist/server/linux/amd64
-      - echo 'echo binary' > dist/server/linux/amd64/woodpecker-server
-      - chmod +x dist/server/linux/amd64/woodpecker-server
+ cross-compile-server-preview:
+   image: *xgo_image
+   pull: true
+   commands:
+     - apt update
+     - apt install -y tree
+     - make cross-compile-server
+   environment:
+     PLATFORMS: linux|amd64
+     TAGS: bindata sqlite sqlite_unlock_notify netgo
+     XGO_VERSION: *xgo_version
+   when:
+     event: pull_request
+  # dummy-compile-server:
+  #   image: bash
+  #   commands:
+  #     - mkdir -p dist/server/linux/amd64
+  #     - echo 'echo binary' > dist/server/linux/amd64/woodpecker-server
+  #     - chmod +x dist/server/linux/amd64/woodpecker-server
 
   publish-server-preview:
     image: woodpeckerci/plugin-docker-buildx:2.1.0