diff --git a/cmd/pro/add/cluster.go b/cmd/pro/add/cluster.go
index 3f0a7b8e8..816aacc61 100644
--- a/cmd/pro/add/cluster.go
+++ b/cmd/pro/add/cluster.go
@@ -9,9 +9,9 @@ import (
 	"os/exec"
 	"time"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
 	"github.com/sirupsen/logrus"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	proflags "github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/cmd/pro/daemon/start.go b/cmd/pro/daemon/start.go
index ea07fc315..621196b67 100644
--- a/cmd/pro/daemon/start.go
+++ b/cmd/pro/daemon/start.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/cmd/pro/completion"
 	proflags "github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
diff --git a/cmd/pro/import_workspace.go b/cmd/pro/import_workspace.go
index 60d57e250..967f9c122 100644
--- a/cmd/pro/import_workspace.go
+++ b/cmd/pro/import_workspace.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strconv"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	proflags "github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/cmd/pro/provider/list"
 	"github.com/skevetter/devpod/pkg/config"
diff --git a/cmd/pro/provider/create/workspace.go b/cmd/pro/provider/create/workspace.go
index d6246625e..4dc12e044 100644
--- a/cmd/pro/provider/create/workspace.go
+++ b/cmd/pro/provider/create/workspace.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"os"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/cmd/pro/provider/list/clusters.go b/cmd/pro/provider/list/clusters.go
index a0d1c03f5..1aea8a5ae 100644
--- a/cmd/pro/provider/list/clusters.go
+++ b/cmd/pro/provider/list/clusters.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/platform"
 	"github.com/skevetter/devpod/pkg/platform/client"
diff --git a/cmd/pro/provider/list/projects.go b/cmd/pro/provider/list/projects.go
index c756cc3e4..c1419bea7 100644
--- a/cmd/pro/provider/list/projects.go
+++ b/cmd/pro/provider/list/projects.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/platform/client"
 	"github.com/skevetter/log"
diff --git a/cmd/pro/provider/list/templates.go b/cmd/pro/provider/list/templates.go
index e78821ce2..649e0124d 100644
--- a/cmd/pro/provider/list/templates.go
+++ b/cmd/pro/provider/list/templates.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"github.com/blang/semver/v4"
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/platform"
 	"github.com/skevetter/devpod/pkg/platform/client"
diff --git a/cmd/pro/provider/list/workspaces.go b/cmd/pro/provider/list/workspaces.go
index bd53671b8..ddf365218 100644
--- a/cmd/pro/provider/list/workspaces.go
+++ b/cmd/pro/provider/list/workspaces.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/cmd/pro/provider/status.go b/cmd/pro/provider/status.go
index 504f49fc0..1b80baff5 100644
--- a/cmd/pro/provider/status.go
+++ b/cmd/pro/provider/status.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"os"
 
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/cmd/pro/provider/stop.go b/cmd/pro/provider/stop.go
index 59b6382f5..4c3ea2e51 100644
--- a/cmd/pro/provider/stop.go
+++ b/cmd/pro/provider/stop.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"os"
 
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/platform"
 	"github.com/skevetter/devpod/pkg/platform/client"
diff --git a/cmd/pro/provider/up.go b/cmd/pro/provider/up.go
index 42f26a3ec..022f02db3 100644
--- a/cmd/pro/provider/up.go
+++ b/cmd/pro/provider/up.go
@@ -7,9 +7,9 @@ import (
 	"io"
 	"os"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
 	"github.com/sirupsen/logrus"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/cmd/pro/provider/update/workspace.go b/cmd/pro/provider/update/workspace.go
index ef9f6754f..5ee642e53 100644
--- a/cmd/pro/provider/update/workspace.go
+++ b/cmd/pro/provider/update/workspace.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"os"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/platform"
 	"github.com/skevetter/devpod/pkg/platform/client"
diff --git a/cmd/pro/provider/watch/workspaces.go b/cmd/pro/provider/watch/workspaces.go
index b9e92ce11..c37dfb3d8 100644
--- a/cmd/pro/provider/watch/workspaces.go
+++ b/cmd/pro/provider/watch/workspaces.go
@@ -9,11 +9,11 @@ import (
 	"sync"
 	"time"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
-	loftclient "github.com/loft-sh/api/v4/pkg/clientset/versioned"
-	informers "github.com/loft-sh/api/v4/pkg/informers/externalversions"
-	informermanagementv1 "github.com/loft-sh/api/v4/pkg/informers/externalversions/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
+	loftclient "github.com/skevetter/api/pkg/clientset/versioned"
+	informers "github.com/skevetter/api/pkg/informers/externalversions"
+	informermanagementv1 "github.com/skevetter/api/pkg/informers/externalversions/management/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/cmd/pro/reset/password.go b/cmd/pro/reset/password.go
index 46b168ff3..9dd774cc5 100644
--- a/cmd/pro/reset/password.go
+++ b/cmd/pro/reset/password.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/platform/kube"
 	"github.com/skevetter/devpod/pkg/random"
diff --git a/cmd/pro/sleep.go b/cmd/pro/sleep.go
index f90a71711..7aa0e1c61 100644
--- a/cmd/pro/sleep.go
+++ b/cmd/pro/sleep.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
-	clusterv1 "github.com/loft-sh/agentapi/v4/pkg/apis/loft/cluster/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	clusterv1 "github.com/skevetter/agentapi/pkg/apis/devsy/cluster/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/cmd/pro/start.go b/cmd/pro/start.go
index 1512fdfca..83758196e 100644
--- a/cmd/pro/start.go
+++ b/cmd/pro/start.go
@@ -20,10 +20,10 @@ import (
 	"time"
 
 	jsonpatch "github.com/evanphx/json-patch/v5"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
-	"github.com/loft-sh/api/v4/pkg/auth"
-	loftclientset "github.com/loft-sh/api/v4/pkg/clientset/versioned"
 	"github.com/sirupsen/logrus"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
+	"github.com/skevetter/api/pkg/auth"
+	loftclientset "github.com/skevetter/api/pkg/clientset/versioned"
 	proflags "github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/machineid"
diff --git a/cmd/pro/wakeup.go b/cmd/pro/wakeup.go
index a92eac760..d42f4190c 100644
--- a/cmd/pro/wakeup.go
+++ b/cmd/pro/wakeup.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
-	clusterv1 "github.com/loft-sh/agentapi/v4/pkg/apis/loft/cluster/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	clusterv1 "github.com/skevetter/agentapi/pkg/apis/devsy/cluster/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/cmd/pro/flags"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/cmd/troubleshoot.go b/cmd/troubleshoot.go
index ab085fd76..1a60b6b8d 100644
--- a/cmd/troubleshoot.go
+++ b/cmd/troubleshoot.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/cmd/completion"
 	"github.com/skevetter/devpod/cmd/flags"
 	"github.com/skevetter/devpod/cmd/provider"
diff --git a/go.mod b/go.mod
index 2f5b81244..ad9af0324 100644
--- a/go.mod
+++ b/go.mod
@@ -32,9 +32,6 @@ require (
 	github.com/gorilla/handlers v1.5.2
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
 	github.com/joho/godotenv v1.5.1
-	github.com/loft-sh/agentapi/v4 v4.8.1
-	github.com/loft-sh/api/v4 v4.4.0
-	github.com/loft-sh/apiserver v0.0.0-20260113122925-594495a02e96
 	github.com/moby/buildkit v0.29.0
 	github.com/moby/patternmatcher v0.6.1
 	github.com/moby/term v0.5.2
@@ -42,6 +39,9 @@ require (
 	github.com/onsi/gomega v1.39.1
 	github.com/pkg/sftp v1.13.10
 	github.com/sirupsen/logrus v1.9.4
+	github.com/skevetter/agentapi v1.0.0
+	github.com/skevetter/api v1.0.1
+	github.com/skevetter/apiserver v1.0.2
 	github.com/skevetter/log v0.0.0-20260106023547-bfd26ab1367c
 	github.com/skevetter/ssh v0.1.0
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
@@ -158,15 +158,15 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.22.5 // indirect
 	github.com/go-openapi/jsonreference v0.21.5 // indirect
-	github.com/go-openapi/swag v0.25.4 // indirect
-	github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
+	github.com/go-openapi/swag v0.25.5 // indirect
+	github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
 	github.com/go-openapi/swag/conv v0.25.5 // indirect
 	github.com/go-openapi/swag/fileutils v0.25.5 // indirect
 	github.com/go-openapi/swag/jsonname v0.25.5 // indirect
 	github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
 	github.com/go-openapi/swag/loading v0.25.5 // indirect
 	github.com/go-openapi/swag/mangling v0.25.5 // indirect
-	github.com/go-openapi/swag/netutils v0.25.4 // indirect
+	github.com/go-openapi/swag/netutils v0.25.5 // indirect
 	github.com/go-openapi/swag/stringutils v0.25.5 // indirect
 	github.com/go-openapi/swag/typeutils v0.25.5 // indirect
 	github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
@@ -178,7 +178,7 @@ require (
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/cel-go v0.26.1 // indirect
-	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/gnostic-models v0.7.1 // indirect
 	github.com/google/go-github/v74 v74.0.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
@@ -200,7 +200,6 @@ require (
 	github.com/kr/fs v0.1.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/loft-sh/admin-apis v0.0.0-20260311181619-506013b79ba0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -244,6 +243,7 @@ require (
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
 	github.com/secure-systems-lab/go-securesystemslib v0.10.0 // indirect
 	github.com/shibumi/go-pathspec v1.3.0 // indirect
+	github.com/skevetter/admin-apis v1.0.0 // indirect
 	github.com/stoewer/go-strcase v1.3.1 // indirect
 	github.com/tailscale/certstore v0.1.1-0.20231202035212-d3fa0460f47e // indirect
 	github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
@@ -303,7 +303,7 @@ require (
 	k8s.io/apiserver v0.35.3 // indirect
 	k8s.io/cli-runtime v0.35.3 // indirect
 	k8s.io/component-base v0.35.3 // indirect
-	k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
+	k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31 // indirect
 	k8s.io/metrics v0.35.3 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
 	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
diff --git a/go.sum b/go.sum
index 81df4b64c..b0243cd05 100644
--- a/go.sum
+++ b/go.sum
@@ -296,10 +296,10 @@ github.com/go-openapi/jsonpointer v0.22.5 h1:8on/0Yp4uTb9f4XvTrM2+1CPrV05QPZXu+r
 github.com/go-openapi/jsonpointer v0.22.5/go.mod h1:gyUR3sCvGSWchA2sUBJGluYMbe1zazrYWIkWPjjMUY0=
 github.com/go-openapi/jsonreference v0.21.5 h1:6uCGVXU/aNF13AQNggxfysJ+5ZcU4nEAe+pJyVWRdiE=
 github.com/go-openapi/jsonreference v0.21.5/go.mod h1:u25Bw85sX4E2jzFodh1FOKMTZLcfifd1Q+iKKOUxExw=
-github.com/go-openapi/swag v0.25.4 h1:OyUPUFYDPDBMkqyxOTkqDYFnrhuhi9NR6QVUvIochMU=
-github.com/go-openapi/swag v0.25.4/go.mod h1:zNfJ9WZABGHCFg2RnY0S4IOkAcVTzJ6z2Bi+Q4i6qFQ=
-github.com/go-openapi/swag/cmdutils v0.25.4 h1:8rYhB5n6WawR192/BfUu2iVlxqVR9aRgGJP6WaBoW+4=
-github.com/go-openapi/swag/cmdutils v0.25.4/go.mod h1:pdae/AFo6WxLl5L0rq87eRzVPm/XRHM3MoYgRMvG4A0=
+github.com/go-openapi/swag v0.25.5 h1:pNkwbUEeGwMtcgxDr+2GBPAk4kT+kJ+AaB+TMKAg+TU=
+github.com/go-openapi/swag v0.25.5/go.mod h1:B3RT6l8q7X803JRxa2e59tHOiZlX1t8viplOcs9CwTA=
+github.com/go-openapi/swag/cmdutils v0.25.5 h1:yh5hHrpgsw4NwM9KAEtaDTXILYzdXh/I8Whhx9hKj7c=
+github.com/go-openapi/swag/cmdutils v0.25.5/go.mod h1:pdae/AFo6WxLl5L0rq87eRzVPm/XRHM3MoYgRMvG4A0=
 github.com/go-openapi/swag/conv v0.25.5 h1:wAXBYEXJjoKwE5+vc9YHhpQOFj2JYBMF2DUi+tGu97g=
 github.com/go-openapi/swag/conv v0.25.5/go.mod h1:CuJ1eWvh1c4ORKx7unQnFGyvBbNlRKbnRyAvDvzWA4k=
 github.com/go-openapi/swag/fileutils v0.25.5 h1:B6JTdOcs2c0dBIs9HnkyTW+5gC+8NIhVBUwERkFhMWk=
@@ -314,8 +314,8 @@ github.com/go-openapi/swag/loading v0.25.5 h1:odQ/umlIZ1ZVRteI6ckSrvP6e2w9UTF5qg
 github.com/go-openapi/swag/loading v0.25.5/go.mod h1:I8A8RaaQ4DApxhPSWLNYWh9NvmX2YKMoB9nwvv6oW6g=
 github.com/go-openapi/swag/mangling v0.25.5 h1:hyrnvbQRS7vKePQPHHDso+k6CGn5ZBs5232UqWZmJZw=
 github.com/go-openapi/swag/mangling v0.25.5/go.mod h1:6hadXM/o312N/h98RwByLg088U61TPGiltQn71Iw0NY=
-github.com/go-openapi/swag/netutils v0.25.4 h1:Gqe6K71bGRb3ZQLusdI8p/y1KLgV4M/k+/HzVSqT8H0=
-github.com/go-openapi/swag/netutils v0.25.4/go.mod h1:m2W8dtdaoX7oj9rEttLyTeEFFEBvnAx9qHd5nJEBzYg=
+github.com/go-openapi/swag/netutils v0.25.5 h1:LZq2Xc2QI8+7838elRAaPCeqJnHODfSyOa7ZGfxDKlU=
+github.com/go-openapi/swag/netutils v0.25.5/go.mod h1:lHbtmj4m57APG/8H7ZcMMSWzNqIQcu0RFiXrPUara14=
 github.com/go-openapi/swag/stringutils v0.25.5 h1:NVkoDOA8YBgtAR/zvCx5rhJKtZF3IzXcDdwOsYzrB6M=
 github.com/go-openapi/swag/stringutils v0.25.5/go.mod h1:PKK8EZdu4QJq8iezt17HM8RXnLAzY7gW0O1KKarrZII=
 github.com/go-openapi/swag/typeutils v0.25.5 h1:EFJ+PCga2HfHGdo8s8VJXEVbeXRCYwzzr9u4rJk7L7E=
@@ -352,8 +352,8 @@ github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
 github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/cel-go v0.26.1 h1:iPbVVEdkhTX++hpe3lzSk7D3G3QSYqLGoHOcEio+UXQ=
 github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
-github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
-github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
+github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
+github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
@@ -452,14 +452,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
-github.com/loft-sh/admin-apis v0.0.0-20260311181619-506013b79ba0 h1:12fy1LhhyuQ46ls272yWn6HpAMLNUClsBYqRvu+qTC0=
-github.com/loft-sh/admin-apis v0.0.0-20260311181619-506013b79ba0/go.mod h1:pp+2PgOsRCTb1DXnEev/HCc0gvj5t0nHuTIMU8C8b90=
-github.com/loft-sh/agentapi/v4 v4.8.1 h1:o50ZvSS9R62gaWYcZl6uhVYnhYb6KbBvuOCiIpqUX1E=
-github.com/loft-sh/agentapi/v4 v4.8.1/go.mod h1:imoDDofcfZKLEy8Mpt0gWUKQWAXQ3oUVEyfWFil9Vdc=
-github.com/loft-sh/api/v4 v4.4.0 h1:RP4YsNay7xqay0oxb8g4n7NECVxE/ogQApFov8Z4nZ8=
-github.com/loft-sh/api/v4 v4.4.0/go.mod h1:LqPbhgISsMvxIucmEUe42ifwuAG6kyqSBy1WTcrtGPQ=
-github.com/loft-sh/apiserver v0.0.0-20260113122925-594495a02e96 h1:MnvrgRnVm7X8zQPyVS2U2veIxacmVUYSFTHsoi6sJrw=
-github.com/loft-sh/apiserver v0.0.0-20260113122925-594495a02e96/go.mod h1:yBY01KhmW2XAWoqbAx8rx3xqwVwGMa3OYwiM2eYalY4=
 github.com/loft-sh/ssh v0.0.5 h1:CmLfBrbekAZmYhpS+urhqmUZW1XU9kUo2bi4lJiUFH8=
 github.com/loft-sh/ssh v0.0.5/go.mod h1:jgAfPSNioyL2wdFesXY5Wi4pYpdNo4u7AzworofHeyU=
 github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
@@ -603,6 +595,14 @@ github.com/sigstore/sigstore-go v1.1.4 h1:wTTsgCHOfqiEzVyBYA6mDczGtBkN7cM8mPpjJj
 github.com/sigstore/sigstore-go v1.1.4/go.mod h1:2U/mQOT9cjjxrtIUeKDVhL+sHBKsnWddn8URlswdBsg=
 github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
 github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
+github.com/skevetter/admin-apis v1.0.0 h1:oXIWW5LTHfPT2cdVYfmg5SggbBykrmZRNr/H+IUHsBk=
+github.com/skevetter/admin-apis v1.0.0/go.mod h1:rDIvXLlsR4XkMVDeEXsggcmu68cDFGzZBaCVl1qU93Y=
+github.com/skevetter/agentapi v1.0.0 h1:de5L6nbBkinLKwifDsG4+/6DGpiMNe4hdzHPzcnMouM=
+github.com/skevetter/agentapi v1.0.0/go.mod h1:l+46eWug+2eke0sEJnn8kH2TSY1ncPCqFvuiBhl06A4=
+github.com/skevetter/api v1.0.1 h1:kEn92GKhqOvIxQ2Sb3R7QiFoku7Za6TAt3F4gK7wswI=
+github.com/skevetter/api v1.0.1/go.mod h1:AwvwDqWn+2umZGwtqC0iw4vvPaihAKwmKbVQj0ehBsc=
+github.com/skevetter/apiserver v1.0.2 h1:mBLG7soqHAMsjKsQ2JBE2FGVtm57brOKPGiWGiapbr0=
+github.com/skevetter/apiserver v1.0.2/go.mod h1:WiLG4gsfMyvET33XtIeZtnJoOmE2zqXtoAdWDgma3Fg=
 github.com/skevetter/log v0.0.0-20260106023547-bfd26ab1367c h1:2IjLo9V6TLV2rORRKKu+NVMSrOAEeuS4KJPk3v9e1rs=
 github.com/skevetter/log v0.0.0-20260106023547-bfd26ab1367c/go.mod h1:Aqjwx8xRSxBWtTYXK3EzxManSgYZl7FaSh8J5LvTAK0=
 github.com/skevetter/ssh v0.1.0 h1:+Kcb77Z8WHc+uiHVF9JJCMZjdFiY+o/Tn2Pz7pGyIDs=
@@ -891,8 +891,8 @@ k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
 k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
 k8s.io/kube-aggregator v0.35.3 h1:erIo8Dfapd0Fg44XAbgCNioJMtr3Z5mI/G1PSpj9B7Q=
 k8s.io/kube-aggregator v0.35.3/go.mod h1:lOLyWTEuiKT2kS/Wkj0foq+P+Xt4gs/xkrhz2r33lAQ=
-k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 h1:HhDfevmPS+OalTjQRKbTHppRIz01AWi8s45TMXStgYY=
-k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
+k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31 h1:V+sn9a/1fEYDGwnllCmqXBk8x7obZ+hl869Q3Abumkg=
+k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0=
 k8s.io/kubectl v0.35.3 h1:1KqSYXk/sodU7VeDvK6atX2kAGUZd2QTeR5K7Hb9r9w=
 k8s.io/kubectl v0.35.3/go.mod h1:GPHxZqRe+u/i3gTBoVQHeIyq2NilfNPj9hDWeuN3x5s=
 k8s.io/metrics v0.35.3 h1:WonA18pEwrtb7a6XfhFg1ZY1Le0RFkcEw7CFApMTZos=
diff --git a/pkg/agent/tunnelserver/options.go b/pkg/agent/tunnelserver/options.go
index 81e006ee5..3a0783f66 100644
--- a/pkg/agent/tunnelserver/options.go
+++ b/pkg/agent/tunnelserver/options.go
@@ -1,7 +1,7 @@
 package tunnelserver
 
 import (
-	"github.com/loft-sh/api/v4/pkg/devpod"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/devcontainer/config"
 	"github.com/skevetter/devpod/pkg/netstat"
 	provider2 "github.com/skevetter/devpod/pkg/provider"
@@ -51,7 +51,7 @@ func WithMounts(mounts []*config.Mount) Option {
 	}
 }
 
-func WithPlatformOptions(options *devpod.PlatformOptions) Option {
+func WithPlatformOptions(options *devsy.PlatformOptions) Option {
 	return func(s *tunnelServer) *tunnelServer {
 		s.platformOptions = options
 		return s
diff --git a/pkg/agent/tunnelserver/tunnelserver.go b/pkg/agent/tunnelserver/tunnelserver.go
index 44f4b3fb2..c027c4b68 100644
--- a/pkg/agent/tunnelserver/tunnelserver.go
+++ b/pkg/agent/tunnelserver/tunnelserver.go
@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/loft-sh/api/v4/pkg/devpod"
 	"github.com/moby/patternmatcher/ignorefile"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/agent/tunnel"
 	pkgconfig "github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/devcontainer/config"
@@ -118,7 +118,7 @@ type tunnelServer struct {
 	workspace              *provider2.Workspace
 	log                    log.Logger
 
-	platformOptions *devpod.PlatformOptions
+	platformOptions *devsy.PlatformOptions
 }
 
 func (t *tunnelServer) RunWithResult(
diff --git a/pkg/agent/workspace.go b/pkg/agent/workspace.go
index e9c16f2ad..38512c762 100644
--- a/pkg/agent/workspace.go
+++ b/pkg/agent/workspace.go
@@ -14,8 +14,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/loft-sh/api/v4/pkg/devpod"
 	"github.com/moby/patternmatcher/ignorefile"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/command"
 	"github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/git"
@@ -360,7 +360,7 @@ func CloneRepositoryForWorkspace(
 		}
 
 		// marshal options
-		jsonOptions, err := json.Marshal(&devpod.CloneOptions{
+		jsonOptions, err := json.Marshal(&devsy.CloneOptions{
 			Repository:        source.GitRepository,
 			Branch:            source.GitBranch,
 			Commit:            source.GitCommit,
@@ -377,7 +377,7 @@ func CloneRepositoryForWorkspace(
 
 		// create client
 		log.Infof("Cloning repository %s in platform", source.GitRepository)
-		_, err = devpod.NewRunnerClient(grpcClient).Clone(ctx, &devpod.CloneRequest{
+		_, err = devsy.NewRunnerClient(grpcClient).Clone(ctx, &devsy.CloneRequest{
 			TargetPath: workspaceDir,
 			Options:    string(jsonOptions),
 		})
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 100f694f2..725951035 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/loft-sh/api/v4/pkg/devpod"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/devcontainer/config"
 	"github.com/skevetter/devpod/pkg/provider"
 	"golang.org/x/crypto/ssh"
@@ -136,11 +136,11 @@ type WorkspaceClient interface {
 }
 
 type StopOptions struct {
-	Platform devpod.PlatformOptions `json:"platform"`
+	Platform devsy.PlatformOptions `json:"platform"`
 }
 
 type DeleteOptions struct {
-	Platform devpod.PlatformOptions `json:"platform"`
+	Platform devsy.PlatformOptions `json:"platform"`
 
 	IgnoreNotFound bool   `json:"ignoreNotFound,omitempty"`
 	Force          bool   `json:"force,omitempty"`
diff --git a/pkg/client/clientimplementation/daemonclient/client.go b/pkg/client/clientimplementation/daemonclient/client.go
index 6af1ae307..00509756d 100644
--- a/pkg/client/clientimplementation/daemonclient/client.go
+++ b/pkg/client/clientimplementation/daemonclient/client.go
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	clientpkg "github.com/skevetter/devpod/pkg/client"
 	"github.com/skevetter/devpod/pkg/config"
 	daemon "github.com/skevetter/devpod/pkg/daemon/platform"
diff --git a/pkg/client/clientimplementation/daemonclient/form.go b/pkg/client/clientimplementation/daemonclient/form.go
index 468838f5d..f380b5f06 100644
--- a/pkg/client/clientimplementation/daemonclient/form.go
+++ b/pkg/client/clientimplementation/daemonclient/form.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"charm.land/huh/v2"
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/cmd/pro/provider/list"
 	"github.com/skevetter/devpod/pkg/encoding"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/pkg/client/clientimplementation/daemonclient/stop.go b/pkg/client/clientimplementation/daemonclient/stop.go
index acddab15d..67f78e92e 100644
--- a/pkg/client/clientimplementation/daemonclient/stop.go
+++ b/pkg/client/clientimplementation/daemonclient/stop.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	clientpkg "github.com/skevetter/devpod/pkg/client"
 	"github.com/skevetter/devpod/pkg/platform"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/client/clientimplementation/daemonclient/up.go b/pkg/client/clientimplementation/daemonclient/up.go
index 29b18e449..197351a34 100644
--- a/pkg/client/clientimplementation/daemonclient/up.go
+++ b/pkg/client/clientimplementation/daemonclient/up.go
@@ -9,10 +9,10 @@ import (
 	"os"
 	"time"
 
-	_ "github.com/loft-sh/api/v4/pkg/apis/management/install" // Install the management group to ensure the option types are registered
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
-	"github.com/loft-sh/apiserver/pkg/builders"
+	_ "github.com/skevetter/api/pkg/apis/management/install" // Install the management group to ensure the option types are registered
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
+	"github.com/skevetter/apiserver/pkg/builders"
 	clientpkg "github.com/skevetter/devpod/pkg/client"
 	devpodconfig "github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/devcontainer/config"
diff --git a/pkg/client/clientimplementation/proxy_client.go b/pkg/client/clientimplementation/proxy_client.go
index 69598bd9d..de94b581b 100644
--- a/pkg/client/clientimplementation/proxy_client.go
+++ b/pkg/client/clientimplementation/proxy_client.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/blang/semver/v4"
 	"github.com/gofrs/flock"
-	"github.com/loft-sh/api/v4/pkg/devpod"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/client"
 	"github.com/skevetter/devpod/pkg/config"
 	devpodlog "github.com/skevetter/devpod/pkg/log"
@@ -447,7 +447,7 @@ func DecodeOptionsFromEnv(name string, into any) (bool, error) {
 	return true, json.Unmarshal([]byte(raw), into)
 }
 
-func DecodePlatformOptionsFromEnv(into *devpod.PlatformOptions) error {
+func DecodePlatformOptionsFromEnv(into *devsy.PlatformOptions) error {
 	raw := os.Getenv(config.EnvPlatformOptions)
 	if raw == "" {
 		return nil
diff --git a/pkg/client/clientimplementation/services.go b/pkg/client/clientimplementation/services.go
index 9eb26899d..3909ae497 100644
--- a/pkg/client/clientimplementation/services.go
+++ b/pkg/client/clientimplementation/services.go
@@ -3,7 +3,7 @@ package clientimplementation
 import (
 	"context"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/pkg/client"
 	"github.com/skevetter/devpod/pkg/config"
 	daemon "github.com/skevetter/devpod/pkg/daemon/platform"
diff --git a/pkg/daemon/agent/daemon.go b/pkg/daemon/agent/daemon.go
index 9bd214836..d1f3e764c 100644
--- a/pkg/daemon/agent/daemon.go
+++ b/pkg/daemon/agent/daemon.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/loft-sh/api/v4/pkg/devpod"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/command"
 	pkgconfig "github.com/skevetter/devpod/pkg/config"
 	"github.com/skevetter/devpod/pkg/devcontainer/config"
@@ -25,13 +25,13 @@ type SshConfig struct {
 }
 
 type DaemonConfig struct {
-	Platform devpod.PlatformOptions `json:"platform"`
-	Ssh      SshConfig              `json:"ssh"`
-	Timeout  string                 `json:"timeout"`
+	Platform devsy.PlatformOptions `json:"platform"`
+	Ssh      SshConfig             `json:"ssh"`
+	Timeout  string                `json:"timeout"`
 }
 
 func BuildWorkspaceDaemonConfig(
-	platformOptions devpod.PlatformOptions,
+	platformOptions devsy.PlatformOptions,
 	workspaceConfig *provider2.Workspace,
 	substitutionContext *config.SubstitutionContext,
 	mergedConfig *config.MergedDevContainerConfig,
@@ -72,7 +72,7 @@ func BuildWorkspaceDaemonConfig(
 }
 
 func GetEncodedWorkspaceDaemonConfig(
-	platformOptions devpod.PlatformOptions,
+	platformOptions devsy.PlatformOptions,
 	workspaceConfig *provider2.Workspace,
 	substitutionContext *config.SubstitutionContext,
 	mergedConfig *config.MergedDevContainerConfig,
diff --git a/pkg/daemon/platform/client.go b/pkg/daemon/platform/client.go
index c0b6ffeee..800dad87c 100644
--- a/pkg/daemon/platform/client.go
+++ b/pkg/daemon/platform/client.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"time"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/pkg/platform"
 )
 
diff --git a/pkg/daemon/platform/local_server.go b/pkg/daemon/platform/local_server.go
index 7f4e972fc..85b607f2e 100644
--- a/pkg/daemon/platform/local_server.go
+++ b/pkg/daemon/platform/local_server.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/gorilla/handlers"
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
 	"github.com/sirupsen/logrus"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 	"github.com/skevetter/devpod/pkg/dockercredentials"
 	"github.com/skevetter/devpod/pkg/gitcredentials"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/pkg/daemon/platform/workspace_watcher.go b/pkg/daemon/platform/workspace_watcher.go
index 71fab69b2..161c36bac 100644
--- a/pkg/daemon/platform/workspace_watcher.go
+++ b/pkg/daemon/platform/workspace_watcher.go
@@ -8,11 +8,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
-	loftclient "github.com/loft-sh/api/v4/pkg/clientset/versioned"
-	typedmanagementv1 "github.com/loft-sh/api/v4/pkg/clientset/versioned/typed/management/v1"
-	informers "github.com/loft-sh/api/v4/pkg/informers/externalversions"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
+	loftclient "github.com/skevetter/api/pkg/clientset/versioned"
+	typedmanagementv1 "github.com/skevetter/api/pkg/clientset/versioned/typed/management/v1"
+	informers "github.com/skevetter/api/pkg/informers/externalversions"
 	"github.com/skevetter/devpod/pkg/platform"
 	"github.com/skevetter/devpod/pkg/platform/client"
 	"github.com/skevetter/devpod/pkg/platform/project"
diff --git a/pkg/devcontainer/buildkit/remote.go b/pkg/devcontainer/buildkit/remote.go
index da8dcc0a9..f923c55e5 100644
--- a/pkg/devcontainer/buildkit/remote.go
+++ b/pkg/devcontainer/buildkit/remote.go
@@ -18,12 +18,12 @@ import (
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
-	"github.com/loft-sh/api/v4/pkg/devpod"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/exporter/containerimage/exptypes"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/session/auth/authprovider"
 	"github.com/sirupsen/logrus"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/devcontainer/build"
 	"github.com/skevetter/devpod/pkg/devcontainer/config"
 	"github.com/skevetter/devpod/pkg/devcontainer/feature"
@@ -476,7 +476,7 @@ type certPaths struct {
 	CertPath  string
 }
 
-func ensureCertPaths(buildOpts *devpod.PlatformBuildOptions) (*certPaths, error) {
+func ensureCertPaths(buildOpts *devsy.PlatformBuildOptions) (*certPaths, error) {
 	parentDir, err := os.MkdirTemp("", "build-certs-*")
 	if err != nil {
 		return nil, fmt.Errorf("create temp dir: %w", err)
diff --git a/pkg/devcontainer/setup/setup.go b/pkg/devcontainer/setup/setup.go
index 66e51dc21..343422c97 100644
--- a/pkg/devcontainer/setup/setup.go
+++ b/pkg/devcontainer/setup/setup.go
@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/loft-sh/api/v4/pkg/devpod"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/agent"
 	"github.com/skevetter/devpod/pkg/agent/tunnel"
 	"github.com/skevetter/devpod/pkg/command"
@@ -32,7 +32,7 @@ type ContainerSetupConfig struct {
 	SetupInfo         *config.Result
 	ExtraWorkspaceEnv []string
 	ChownProjects     bool
-	PlatformOptions   *devpod.PlatformOptions
+	PlatformOptions   *devsy.PlatformOptions
 	TunnelClient      tunnel.TunnelClient
 	Log               log.Logger
 }
@@ -453,7 +453,7 @@ func markerFileExists(markerName string, markerContent string) (bool, error) {
 
 func setupPlatformGitCredentials(
 	userName string,
-	platformOptions *devpod.PlatformOptions,
+	platformOptions *devsy.PlatformOptions,
 	log log.Logger,
 ) error {
 	// platform is not enabled, skip
@@ -494,7 +494,7 @@ func setupPlatformGitCredentials(
 
 func setupPlatformGitHTTPCredentials(
 	userName string,
-	platformOptions *devpod.PlatformOptions,
+	platformOptions *devsy.PlatformOptions,
 	log log.Logger,
 ) error {
 	if !platformOptions.Enabled || len(platformOptions.UserCredentials.GitHttp) == 0 {
@@ -516,7 +516,7 @@ func setupPlatformGitHTTPCredentials(
 
 func setupPlatformGitSSHKeys(
 	userName string,
-	platformOptions *devpod.PlatformOptions,
+	platformOptions *devsy.PlatformOptions,
 	log log.Logger,
 ) error {
 	if !platformOptions.Enabled || len(platformOptions.UserCredentials.GitSsh) == 0 {
diff --git a/pkg/platform/client/client.go b/pkg/platform/client/client.go
index 0b72da5cc..cac76cc4a 100644
--- a/pkg/platform/client/client.go
+++ b/pkg/platform/client/client.go
@@ -16,9 +16,9 @@ import (
 	"time"
 
 	"github.com/blang/semver/v4"
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
-	"github.com/loft-sh/api/v4/pkg/auth"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
+	"github.com/skevetter/api/pkg/auth"
 	pkgconfig "github.com/skevetter/devpod/pkg/config"
 	devpodopen "github.com/skevetter/devpod/pkg/open"
 	"github.com/skevetter/devpod/pkg/platform/kube"
diff --git a/pkg/platform/form/form.go b/pkg/platform/form/form.go
index 9969425bb..1d536c57a 100644
--- a/pkg/platform/form/form.go
+++ b/pkg/platform/form/form.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"charm.land/huh/v2"
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/cmd/pro/provider/list"
 	"github.com/skevetter/devpod/pkg/encoding"
 	"github.com/skevetter/devpod/pkg/platform"
diff --git a/pkg/platform/instance.go b/pkg/platform/instance.go
index 9fe761757..c2fc5bae8 100644
--- a/pkg/platform/instance.go
+++ b/pkg/platform/instance.go
@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/pkg/platform/client"
 	"github.com/skevetter/devpod/pkg/platform/kube"
 	"github.com/skevetter/devpod/pkg/platform/project"
diff --git a/pkg/platform/kube/kube.go b/pkg/platform/kube/kube.go
index ad0da52b9..e201e9f34 100644
--- a/pkg/platform/kube/kube.go
+++ b/pkg/platform/kube/kube.go
@@ -3,7 +3,7 @@ package kube
 import (
 	"fmt"
 
-	loftclient "github.com/loft-sh/api/v4/pkg/clientset/versioned"
+	loftclient "github.com/skevetter/api/pkg/clientset/versioned"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 )
diff --git a/pkg/platform/kubeconfig.go b/pkg/platform/kubeconfig.go
index 32e1c57d4..9f97e8e7b 100644
--- a/pkg/platform/kubeconfig.go
+++ b/pkg/platform/kubeconfig.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
-	"github.com/loft-sh/api/v4/pkg/devpod"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/platform/annotations"
 	"github.com/skevetter/devpod/pkg/platform/client"
 	"github.com/skevetter/devpod/pkg/platform/project"
@@ -23,7 +23,7 @@ var configTTL time.Duration = time.Hour * 24 * 90 // 90 days
 // We return the config as byte slice to ensure correct handling and formatting through the `clientcmd` methods.
 func NewInstanceKubeConfig(
 	ctx context.Context,
-	platformOptions *devpod.PlatformOptions,
+	platformOptions *devsy.PlatformOptions,
 ) ([]byte, error) {
 	if platformOptions == nil {
 		return nil, nil
diff --git a/pkg/platform/owner.go b/pkg/platform/owner.go
index 797533f5a..09ba7beff 100644
--- a/pkg/platform/owner.go
+++ b/pkg/platform/owner.go
@@ -3,8 +3,8 @@ package platform
 import (
 	"fmt"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/spf13/pflag"
 )
 
diff --git a/pkg/platform/parameters/parameters.go b/pkg/platform/parameters/parameters.go
index 3c6de9b7a..444c10ed7 100644
--- a/pkg/platform/parameters/parameters.go
+++ b/pkg/platform/parameters/parameters.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 )
 
 func VerifyValue(value string, parameter storagev1.AppParameter) (any, error) {
diff --git a/pkg/platform/user.go b/pkg/platform/user.go
index 411a64579..29a6da698 100644
--- a/pkg/platform/user.go
+++ b/pkg/platform/user.go
@@ -1,7 +1,7 @@
 package platform
 
 import (
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
 )
 
 func GetUserName(self *managementv1.Self) string {
diff --git a/pkg/provider/workspace.go b/pkg/provider/workspace.go
index b668bf50c..017bcb56a 100644
--- a/pkg/provider/workspace.go
+++ b/pkg/provider/workspace.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/loft-sh/api/v4/pkg/devpod"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/config"
 	devcontainerconfig "github.com/skevetter/devpod/pkg/devcontainer/config"
 	"github.com/skevetter/devpod/pkg/git"
@@ -203,7 +203,7 @@ type AgentWorkspaceInfo struct {
 
 type CLIOptions struct {
 	// Platform are the platform options
-	Platform devpod.PlatformOptions `json:"platformOptions"`
+	Platform devsy.PlatformOptions `json:"platformOptions"`
 
 	// up options
 	ID                          string            `json:"id,omitempty"`
diff --git a/pkg/tunnel/services.go b/pkg/tunnel/services.go
index f3534c75c..6cb7c548f 100644
--- a/pkg/tunnel/services.go
+++ b/pkg/tunnel/services.go
@@ -13,8 +13,8 @@ import (
 
 	"al.essio.dev/pkg/shellescape"
 	"github.com/docker/go-connections/nat"
-	"github.com/loft-sh/api/v4/pkg/devpod"
 	"github.com/sirupsen/logrus"
+	"github.com/skevetter/api/pkg/devsy"
 	"github.com/skevetter/devpod/pkg/agent"
 	"github.com/skevetter/devpod/pkg/agent/tunnelserver"
 	"github.com/skevetter/devpod/pkg/config"
@@ -46,7 +46,7 @@ type RunServicesOptions struct {
 	User                           string
 	ForwardPorts                   bool
 	ExtraPorts                     []string
-	PlatformOptions                *devpod.PlatformOptions
+	PlatformOptions                *devsy.PlatformOptions
 	Workspace                      *provider.Workspace
 	ConfigureDockerCredentials     bool
 	ConfigureGitCredentials        bool
diff --git a/pkg/workspace/list.go b/pkg/workspace/list.go
index 7410882c0..f18c40d4a 100644
--- a/pkg/workspace/list.go
+++ b/pkg/workspace/list.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"sync"
 
-	managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
-	storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
 	"github.com/sirupsen/logrus"
+	managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
+	storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
 	"github.com/skevetter/devpod/pkg/client/clientimplementation"
 	"github.com/skevetter/devpod/pkg/config"
 	daemon "github.com/skevetter/devpod/pkg/daemon/platform"