diff --git a/cmd/admin/v1/commands.go b/cmd/admin/v2/commands.go
similarity index 97%
rename from cmd/admin/v1/commands.go
rename to cmd/admin/v2/commands.go
index 52d9c49..881a7be 100644
--- a/cmd/admin/v1/commands.go
+++ b/cmd/admin/v2/commands.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"github.com/metal-stack/cli/cmd/config"
diff --git a/cmd/admin/v1/image.go b/cmd/admin/v2/image.go
similarity index 99%
rename from cmd/admin/v1/image.go
rename to cmd/admin/v2/image.go
index be9e7d0..4aa0fda 100644
--- a/cmd/admin/v1/image.go
+++ b/cmd/admin/v2/image.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/admin/v1/project.go b/cmd/admin/v2/project.go
similarity index 99%
rename from cmd/admin/v1/project.go
rename to cmd/admin/v2/project.go
index 7228228..49071fc 100644
--- a/cmd/admin/v1/project.go
+++ b/cmd/admin/v2/project.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/admin/v1/tenant.go b/cmd/admin/v2/tenant.go
similarity index 99%
rename from cmd/admin/v1/tenant.go
rename to cmd/admin/v2/tenant.go
index 7c7895d..df4f8c2 100644
--- a/cmd/admin/v1/tenant.go
+++ b/cmd/admin/v2/tenant.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/admin/v1/token.go b/cmd/admin/v2/token.go
similarity index 96%
rename from cmd/admin/v1/token.go
rename to cmd/admin/v2/token.go
index 91f0bbd..67b015a 100644
--- a/cmd/admin/v1/token.go
+++ b/cmd/admin/v2/token.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
@@ -25,7 +25,7 @@ func newTokenCmd(c *config.Config) *cobra.Command {
 
 	cmdsConfig := &genericcli.CmdsConfig[any, any, *apiv2.Token]{
 		BinaryName:      config.BinaryName,
-		GenericCLI:      genericcli.NewGenericCLI[any, any, *apiv2.Token](w).WithFS(c.Fs),
+		GenericCLI:      genericcli.NewGenericCLI(w).WithFS(c.Fs),
 		Singular:        "token",
 		Plural:          "tokens",
 		Description:     "manage api tokens for accessing the metal-stack.io api",
diff --git a/cmd/api/v1/commands.go b/cmd/api/v2/commands.go
similarity index 97%
rename from cmd/api/v1/commands.go
rename to cmd/api/v2/commands.go
index 1e62d60..be489cc 100644
--- a/cmd/api/v1/commands.go
+++ b/cmd/api/v2/commands.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"github.com/metal-stack/cli/cmd/config"
diff --git a/cmd/api/v1/health.go b/cmd/api/v2/health.go
similarity index 98%
rename from cmd/api/v1/health.go
rename to cmd/api/v2/health.go
index eac6678..4d2fbc2 100644
--- a/cmd/api/v1/health.go
+++ b/cmd/api/v2/health.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/api/v1/image.go b/cmd/api/v2/image.go
similarity index 99%
rename from cmd/api/v1/image.go
rename to cmd/api/v2/image.go
index 14da8c9..1275fb2 100644
--- a/cmd/api/v1/image.go
+++ b/cmd/api/v2/image.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/api/v1/ip.go b/cmd/api/v2/ip.go
similarity index 99%
rename from cmd/api/v1/ip.go
rename to cmd/api/v2/ip.go
index 3c757fa..2274e94 100644
--- a/cmd/api/v1/ip.go
+++ b/cmd/api/v2/ip.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/api/v1/methods.go b/cmd/api/v2/methods.go
similarity index 99%
rename from cmd/api/v1/methods.go
rename to cmd/api/v2/methods.go
index ff71c49..bdda922 100644
--- a/cmd/api/v1/methods.go
+++ b/cmd/api/v2/methods.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/api/v1/project.go b/cmd/api/v2/project.go
similarity index 99%
rename from cmd/api/v1/project.go
rename to cmd/api/v2/project.go
index 023708e..46fa3f4 100644
--- a/cmd/api/v1/project.go
+++ b/cmd/api/v2/project.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/api/v1/tenant.go b/cmd/api/v2/tenant.go
similarity index 99%
rename from cmd/api/v1/tenant.go
rename to cmd/api/v2/tenant.go
index f94258c..30ee3e1 100644
--- a/cmd/api/v1/tenant.go
+++ b/cmd/api/v2/tenant.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/api/v1/token.go b/cmd/api/v2/token.go
similarity index 99%
rename from cmd/api/v1/token.go
rename to cmd/api/v2/token.go
index 7ca3cc7..425a8f8 100644
--- a/cmd/api/v1/token.go
+++ b/cmd/api/v2/token.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/api/v1/user.go b/cmd/api/v2/user.go
similarity index 99%
rename from cmd/api/v1/user.go
rename to cmd/api/v2/user.go
index 329944e..abcc820 100644
--- a/cmd/api/v1/user.go
+++ b/cmd/api/v2/user.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/api/v1/version.go b/cmd/api/v2/version.go
similarity index 98%
rename from cmd/api/v1/version.go
rename to cmd/api/v2/version.go
index c62219f..08081a0 100644
--- a/cmd/api/v1/version.go
+++ b/cmd/api/v2/version.go
@@ -1,4 +1,4 @@
-package v1
+package v2
 
 import (
 	"fmt"
diff --git a/cmd/root.go b/cmd/root.go
index 9bb0ce1..5692737 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -7,8 +7,8 @@ import (
 	client "github.com/metal-stack/api/go/client"
 	"github.com/metal-stack/metal-lib/pkg/genericcli"
 
-	adminv2 "github.com/metal-stack/cli/cmd/admin/v1"
-	apiv2 "github.com/metal-stack/cli/cmd/api/v1"
+	adminv2 "github.com/metal-stack/cli/cmd/admin/v2"
+	apiv2 "github.com/metal-stack/cli/cmd/api/v2"
 
 	"github.com/metal-stack/cli/cmd/completion"
 	"github.com/metal-stack/cli/cmd/config"