diff --git a/config/pkg/target/go-xcaddy.yml b/config/pkg/target/go-xcaddy.yml
index 89cb4cd0..deafb37d 100644
--- a/config/pkg/target/go-xcaddy.yml
+++ b/config/pkg/target/go-xcaddy.yml
@@ -2,5 +2,11 @@ go-xcaddy:
   type: target
   artifact:
     binary: custom
+  env:
+    GOROOT: '{pkg_root_path}/go-xcaddy'
+    GOBIN: '{pkg_root_path}/go-xcaddy/bin'
+    GOPATH: '{pkg_root_path}/go-xcaddy/go'
+  path@unix:
+    - '{pkg_root_path}/go-xcaddy/bin'
   static-bins:
     - xcaddy
diff --git a/src/Package/Target/go_xcaddy.php b/src/Package/Target/go_xcaddy.php
deleted file mode 100644
index 0f8c7553..00000000
--- a/src/Package/Target/go_xcaddy.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Target;
-
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\InitPackage;
-use StaticPHP\Attribute\Package\Target;
-use StaticPHP\Util\GlobalEnvManager;
-
-#[Target('go-xcaddy')]
-class go_xcaddy
-{
-    #[InitPackage]
-    #[BeforeStage('frankenphp', 'build', 'go-xcaddy')]
-    public function init(): void
-    {
-        if (is_dir(PKG_ROOT_PATH . '/go-xcaddy/bin')) {
-            GlobalEnvManager::addPathIfNotExists(PKG_ROOT_PATH . '/go-xcaddy/bin');
-            GlobalEnvManager::putenv('GOROOT=' . PKG_ROOT_PATH . '/go-xcaddy');
-            GlobalEnvManager::putenv('GOBIN=' . PKG_ROOT_PATH . '/go-xcaddy/bin');
-            GlobalEnvManager::putenv('GOPATH=' . PKG_ROOT_PATH . '/go-xcaddy/go');
-        }
-    }
-}