diff --git a/proto/zitadel/action.proto b/proto/zitadel/action.proto
index 43c9de261d..d717ad52bc 100644
--- a/proto/zitadel/action.proto
+++ b/proto/zitadel/action.proto
@@ -8,7 +8,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.action.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/action";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/action";
 
 message Action {
     string id = 1 [
diff --git a/proto/zitadel/admin.proto b/proto/zitadel/admin.proto
index 6e1020cf5e..dea7b0889c 100644
--- a/proto/zitadel/admin.proto
+++ b/proto/zitadel/admin.proto
@@ -27,7 +27,7 @@ import "validate/validate.proto";
 
 package zitadel.admin.v1;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/admin";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/admin";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     info: {
@@ -41,7 +41,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
         }
         license: {
             name: "Apache 2.0",
-            url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+            url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
         };
     };
     tags: [
diff --git a/proto/zitadel/app.proto b/proto/zitadel/app.proto
index 58735e7c9e..86e63cc635 100644
--- a/proto/zitadel/app.proto
+++ b/proto/zitadel/app.proto
@@ -8,7 +8,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.app.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/app";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/app";
 
 message App {
     string id = 1 [
diff --git a/proto/zitadel/auth.proto b/proto/zitadel/auth.proto
index ed58d70569..8c55537983 100644
--- a/proto/zitadel/auth.proto
+++ b/proto/zitadel/auth.proto
@@ -17,7 +17,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.auth.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/auth";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/auth";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     info: {
@@ -31,7 +31,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
         }
         license: {
             name: "Apache License 2.0",
-            url: "https://github.com/zitadel/zitadel/blob/main/LICENSE"
+            url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE"
         };
     };
     tags: [
diff --git a/proto/zitadel/auth_n_key.proto b/proto/zitadel/auth_n_key.proto
index f5656354da..7c76e1fef9 100644
--- a/proto/zitadel/auth_n_key.proto
+++ b/proto/zitadel/auth_n_key.proto
@@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.authn.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/authn";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/authn";
 
 message Key {
     string id = 1 [
diff --git a/proto/zitadel/change.proto b/proto/zitadel/change.proto
index 36ba003a9c..912eb6dbd7 100644
--- a/proto/zitadel/change.proto
+++ b/proto/zitadel/change.proto
@@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.change.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/change";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/change";
 
 message Change {
     google.protobuf.Timestamp change_date = 1 [
@@ -69,7 +69,7 @@ message ChangeQuery {
     uint32 limit = 2 [
         (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
             example: "20";
-            description: "Maximum amount of events returned. The default is set to 1000 in https://github.com/zitadel/zitadel/blob/new-eventstore/cmd/zitadel/startup.yaml. If no limit is set or the limit exceeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken.";
+            description: "Maximum amount of events returned. The default is set to 1000 in https://github.com/zitadel/zitadel/v2/blob/new-eventstore/cmd/zitadel/startup.yaml. If no limit is set or the limit exceeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken.";
         }
     ];
     bool asc = 3 [
diff --git a/proto/zitadel/event.proto b/proto/zitadel/event.proto
index d00e1efd5f..1336789f1f 100644
--- a/proto/zitadel/event.proto
+++ b/proto/zitadel/event.proto
@@ -9,7 +9,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.event.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/event";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/event";
 
 message Event {
     Editor editor = 1;
diff --git a/proto/zitadel/feature.proto b/proto/zitadel/feature.proto
index 7b82f71517..a7f3ec68d6 100644
--- a/proto/zitadel/feature.proto
+++ b/proto/zitadel/feature.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.feature.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/feature";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/feature";
 
 enum InstanceFeature {
   INSTANCE_FEATURE_UNSPECIFIED = 0;
diff --git a/proto/zitadel/feature/v2/feature.proto b/proto/zitadel/feature/v2/feature.proto
index 3249248735..a0ce463c01 100644
--- a/proto/zitadel/feature/v2/feature.proto
+++ b/proto/zitadel/feature/v2/feature.proto
@@ -4,7 +4,7 @@ package zitadel.feature.v2;
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2;feature";
 
 
 enum Source {
diff --git a/proto/zitadel/feature/v2/feature_service.proto b/proto/zitadel/feature/v2/feature_service.proto
index a89a182632..fe34aad8c7 100644
--- a/proto/zitadel/feature/v2/feature_service.proto
+++ b/proto/zitadel/feature/v2/feature_service.proto
@@ -11,7 +11,7 @@ import "zitadel/feature/v2/organization.proto";
 import "zitadel/feature/v2/user.proto";
 import "zitadel/protoc_gen_zitadel/v2/options.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2;feature";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -25,7 +25,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/feature/v2/instance.proto b/proto/zitadel/feature/v2/instance.proto
index 4dc261f06b..a5215bdf54 100644
--- a/proto/zitadel/feature/v2/instance.proto
+++ b/proto/zitadel/feature/v2/instance.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 import "zitadel/object/v2/object.proto";
 import "zitadel/feature/v2/feature.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2;feature";
 
 message SetInstanceFeaturesRequest{
   optional bool login_default_org = 1 [
diff --git a/proto/zitadel/feature/v2/organization.proto b/proto/zitadel/feature/v2/organization.proto
index 919b9114cf..c7fd24265f 100644
--- a/proto/zitadel/feature/v2/organization.proto
+++ b/proto/zitadel/feature/v2/organization.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 import "zitadel/object/v2/object.proto";
 import "zitadel/feature/v2/feature.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2;feature";
 
 message SetOrganizationFeaturesRequest {
   string organization_id = 1[
diff --git a/proto/zitadel/feature/v2/system.proto b/proto/zitadel/feature/v2/system.proto
index 29d8824da6..aedc69cb08 100644
--- a/proto/zitadel/feature/v2/system.proto
+++ b/proto/zitadel/feature/v2/system.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 import "zitadel/object/v2/object.proto";
 import "zitadel/feature/v2/feature.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2;feature";
 
 message SetSystemFeaturesRequest{
   optional bool login_default_org = 1 [
diff --git a/proto/zitadel/feature/v2/user.proto b/proto/zitadel/feature/v2/user.proto
index d22a981404..261d68874b 100644
--- a/proto/zitadel/feature/v2/user.proto
+++ b/proto/zitadel/feature/v2/user.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 import "zitadel/object/v2/object.proto";
 import "zitadel/feature/v2/feature.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2;feature";
 
 message SetUserFeatureRequest {
   string user_id = 1[
diff --git a/proto/zitadel/feature/v2beta/feature.proto b/proto/zitadel/feature/v2beta/feature.proto
index d5756ee056..80787e7b2a 100644
--- a/proto/zitadel/feature/v2beta/feature.proto
+++ b/proto/zitadel/feature/v2beta/feature.proto
@@ -4,7 +4,7 @@ package zitadel.feature.v2beta;
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2beta;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2beta;feature";
 
 
 enum Source {
diff --git a/proto/zitadel/feature/v2beta/feature_service.proto b/proto/zitadel/feature/v2beta/feature_service.proto
index 3c610e1c13..d3c77e5cea 100644
--- a/proto/zitadel/feature/v2beta/feature_service.proto
+++ b/proto/zitadel/feature/v2beta/feature_service.proto
@@ -11,7 +11,7 @@ import "zitadel/feature/v2beta/organization.proto";
 import "zitadel/feature/v2beta/user.proto";
 import "zitadel/protoc_gen_zitadel/v2/options.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2beta;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2beta;feature";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -25,7 +25,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/feature/v2beta/instance.proto b/proto/zitadel/feature/v2beta/instance.proto
index 865a1d2308..be582d44f3 100644
--- a/proto/zitadel/feature/v2beta/instance.proto
+++ b/proto/zitadel/feature/v2beta/instance.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 import "zitadel/object/v2beta/object.proto";
 import "zitadel/feature/v2beta/feature.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2beta;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2beta;feature";
 
 message SetInstanceFeaturesRequest{
   optional bool login_default_org = 1 [
diff --git a/proto/zitadel/feature/v2beta/organization.proto b/proto/zitadel/feature/v2beta/organization.proto
index df27a8faf6..916987fd7b 100644
--- a/proto/zitadel/feature/v2beta/organization.proto
+++ b/proto/zitadel/feature/v2beta/organization.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 import "zitadel/object/v2beta/object.proto";
 import "zitadel/feature/v2beta/feature.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2beta;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2beta;feature";
 
 message SetOrganizationFeaturesRequest {
   string organization_id = 1[
diff --git a/proto/zitadel/feature/v2beta/system.proto b/proto/zitadel/feature/v2beta/system.proto
index 98b37ad893..6fdbc02cdd 100644
--- a/proto/zitadel/feature/v2beta/system.proto
+++ b/proto/zitadel/feature/v2beta/system.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 import "zitadel/object/v2beta/object.proto";
 import "zitadel/feature/v2beta/feature.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2beta;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2beta;feature";
 
 message SetSystemFeaturesRequest{
   optional bool login_default_org = 1 [
diff --git a/proto/zitadel/feature/v2beta/user.proto b/proto/zitadel/feature/v2beta/user.proto
index d2d5613228..6fd2827447 100644
--- a/proto/zitadel/feature/v2beta/user.proto
+++ b/proto/zitadel/feature/v2beta/user.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 import "zitadel/object/v2beta/object.proto";
 import "zitadel/feature/v2beta/feature.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/feature/v2beta;feature";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/feature/v2beta;feature";
 
 message SetUserFeatureRequest {
   string user_id = 1[
diff --git a/proto/zitadel/idp.proto b/proto/zitadel/idp.proto
index cbb2be9db0..4f70b1e1d0 100644
--- a/proto/zitadel/idp.proto
+++ b/proto/zitadel/idp.proto
@@ -7,7 +7,7 @@ import "google/protobuf/duration.proto";
 
 package zitadel.idp.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/idp";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/idp";
 
 message IDP {
     string id = 1 [
diff --git a/proto/zitadel/idp/v2/idp.proto b/proto/zitadel/idp/v2/idp.proto
index 784e717d3a..750096610f 100644
--- a/proto/zitadel/idp/v2/idp.proto
+++ b/proto/zitadel/idp/v2/idp.proto
@@ -11,7 +11,7 @@ import "validate/validate.proto";
 import "google/protobuf/duration.proto";
 
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/idp/v2;idp";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/idp/v2;idp";
 
 message IDP {
   // Unique identifier for the identity provider.
diff --git a/proto/zitadel/idp/v2/idp_service.proto b/proto/zitadel/idp/v2/idp_service.proto
index 2d5306cea6..926fbc2411 100644
--- a/proto/zitadel/idp/v2/idp_service.proto
+++ b/proto/zitadel/idp/v2/idp_service.proto
@@ -10,7 +10,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 import "zitadel/idp/v2/idp.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/idp/v2;idp";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/idp/v2;idp";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -24,7 +24,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/instance.proto b/proto/zitadel/instance.proto
index c5ef206ee9..faffc9b018 100644
--- a/proto/zitadel/instance.proto
+++ b/proto/zitadel/instance.proto
@@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.instance.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/instance";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/instance";
 
 message Instance {
     string id = 1 [
diff --git a/proto/zitadel/management.proto b/proto/zitadel/management.proto
index 0eeaa29b0b..44ed9519b1 100644
--- a/proto/zitadel/management.proto
+++ b/proto/zitadel/management.proto
@@ -26,7 +26,7 @@ import "validate/validate.proto";
 
 package zitadel.management.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/management";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/management";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     info: {
@@ -40,7 +40,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
         }
         license: {
             name: "Apache License 2.0",
-            url: "https://github.com/zitadel/zitadel/blob/main/LICENSE"
+            url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE"
         }
     };
     tags: [
diff --git a/proto/zitadel/member.proto b/proto/zitadel/member.proto
index 07091e195e..7da7df27bc 100644
--- a/proto/zitadel/member.proto
+++ b/proto/zitadel/member.proto
@@ -7,7 +7,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.member.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/member";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/member";
 
 message Member {
     string user_id = 1 [
diff --git a/proto/zitadel/message.proto b/proto/zitadel/message.proto
index ede9ab5296..9cdaab7796 100644
--- a/proto/zitadel/message.proto
+++ b/proto/zitadel/message.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.v1;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/message";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/message";
 
 message ErrorDetail {
     string id = 1;
diff --git a/proto/zitadel/metadata.proto b/proto/zitadel/metadata.proto
index 7a0409c946..648d44bec7 100644
--- a/proto/zitadel/metadata.proto
+++ b/proto/zitadel/metadata.proto
@@ -6,7 +6,7 @@ import "validate/validate.proto";
 
 package zitadel.metadata.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/metadata";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/metadata";
 
 message Metadata {
     zitadel.v1.ObjectDetails details = 1;
diff --git a/proto/zitadel/milestone/v1/milestone.proto b/proto/zitadel/milestone/v1/milestone.proto
index 36e19beeb7..aca0666835 100644
--- a/proto/zitadel/milestone/v1/milestone.proto
+++ b/proto/zitadel/milestone/v1/milestone.proto
@@ -8,7 +8,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.milestone.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/milestone";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/milestone";
 
 enum MilestoneType {
   MILESTONE_TYPE_UNSPECIFIED = 0;
diff --git a/proto/zitadel/object.proto b/proto/zitadel/object.proto
index 7d4f189e52..ce528e6922 100644
--- a/proto/zitadel/object.proto
+++ b/proto/zitadel/object.proto
@@ -5,7 +5,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/object";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/object";
 
 message ObjectDetails {
     //sequence represents the order of events. It's always counting
@@ -53,7 +53,7 @@ message ListQuery {
     uint32 limit = 2 [
         (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
             example: "100";
-            description: "Maximum amount of events returned. The default is set to 1000 in https://github.com/zitadel/zitadel/blob/new-eventstore/cmd/zitadel/startup.yaml. If the limit exceeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken.";
+            description: "Maximum amount of events returned. The default is set to 1000 in https://github.com/zitadel/zitadel/v2/blob/new-eventstore/cmd/zitadel/startup.yaml. If the limit exceeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken.";
         }
     ];
     bool asc = 3 [
diff --git a/proto/zitadel/object/v2/object.proto b/proto/zitadel/object/v2/object.proto
index 5a63ece19b..df29e03743 100644
--- a/proto/zitadel/object/v2/object.proto
+++ b/proto/zitadel/object/v2/object.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.object.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/object/v2;object";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/object/v2;object";
 
 import "google/protobuf/timestamp.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
@@ -45,7 +45,7 @@ message ListQuery {
   uint32 limit = 2 [
     (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
       example: "100";
-      description: "Maximum amount of events returned. The default is set to 1000 in https://github.com/zitadel/zitadel/blob/new-eventstore/cmd/zitadel/startup.yaml. If the limit exceeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken.";
+      description: "Maximum amount of events returned. The default is set to 1000 in https://github.com/zitadel/zitadel/v2/blob/new-eventstore/cmd/zitadel/startup.yaml. If the limit exceeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken.";
     }
   ];
   bool asc = 3 [
diff --git a/proto/zitadel/object/v2beta/object.proto b/proto/zitadel/object/v2beta/object.proto
index df8e77319a..26bbd4ddaf 100644
--- a/proto/zitadel/object/v2beta/object.proto
+++ b/proto/zitadel/object/v2beta/object.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.object.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/object/v2beta;object";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/object/v2beta;object";
 
 import "google/protobuf/timestamp.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
@@ -45,7 +45,7 @@ message ListQuery {
   uint32 limit = 2 [
     (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
       example: "100";
-      description: "Maximum amount of events returned. The default is set to 1000 in https://github.com/zitadel/zitadel/blob/new-eventstore/cmd/zitadel/startup.yaml. If the limit exceeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken.";
+      description: "Maximum amount of events returned. The default is set to 1000 in https://github.com/zitadel/zitadel/v2/blob/new-eventstore/cmd/zitadel/startup.yaml. If the limit exceeds the maximum configured ZITADEL will throw an error. If no limit is present the default is taken.";
     }
   ];
   bool asc = 3 [
diff --git a/proto/zitadel/object/v3alpha/object.proto b/proto/zitadel/object/v3alpha/object.proto
index a3a2d2325a..e54be048a2 100644
--- a/proto/zitadel/object/v3alpha/object.proto
+++ b/proto/zitadel/object/v3alpha/object.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.object.v3alpha;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/object/v3alpha;object";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/object/v3alpha;object";
 
 import "google/protobuf/timestamp.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
diff --git a/proto/zitadel/oidc/v2/authorization.proto b/proto/zitadel/oidc/v2/authorization.proto
index c0ad751624..fc7ee25758 100644
--- a/proto/zitadel/oidc/v2/authorization.proto
+++ b/proto/zitadel/oidc/v2/authorization.proto
@@ -6,7 +6,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/oidc/v2;oidc";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/oidc/v2;oidc";
 
 message AuthRequest{
   option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema) = {
diff --git a/proto/zitadel/oidc/v2/oidc_service.proto b/proto/zitadel/oidc/v2/oidc_service.proto
index 85044e9570..240aebe424 100644
--- a/proto/zitadel/oidc/v2/oidc_service.proto
+++ b/proto/zitadel/oidc/v2/oidc_service.proto
@@ -10,7 +10,7 @@ import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/oidc/v2;oidc";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/oidc/v2;oidc";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -24,7 +24,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/oidc/v2beta/authorization.proto b/proto/zitadel/oidc/v2beta/authorization.proto
index 2c6c562d50..cea7713c67 100644
--- a/proto/zitadel/oidc/v2beta/authorization.proto
+++ b/proto/zitadel/oidc/v2beta/authorization.proto
@@ -6,7 +6,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/oidc/v2beta;oidc";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/oidc/v2beta;oidc";
 
 message AuthRequest{
   option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema) = {
diff --git a/proto/zitadel/oidc/v2beta/oidc_service.proto b/proto/zitadel/oidc/v2beta/oidc_service.proto
index d962c90a91..d2785742df 100644
--- a/proto/zitadel/oidc/v2beta/oidc_service.proto
+++ b/proto/zitadel/oidc/v2beta/oidc_service.proto
@@ -10,7 +10,7 @@ import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/oidc/v2beta;oidc";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/oidc/v2beta;oidc";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -24,7 +24,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/options.proto b/proto/zitadel/options.proto
index e3dc45f2a6..d7a0b2f8de 100644
--- a/proto/zitadel/options.proto
+++ b/proto/zitadel/options.proto
@@ -4,7 +4,7 @@ package zitadel.v1;
 
 import "google/protobuf/descriptor.proto";
 
-option go_package = "github.com/zitadel/zitadel/internal/protoc/protoc-gen-authoption/authoption";
+option go_package = "github.com/zitadel/zitadel/v2/internal/protoc/protoc-gen-authoption/authoption";
 
 extend google.protobuf.MethodOptions {
     AuthOption auth_option = 50000;
diff --git a/proto/zitadel/org.proto b/proto/zitadel/org.proto
index 2d6083e8bc..bd2068622c 100644
--- a/proto/zitadel/org.proto
+++ b/proto/zitadel/org.proto
@@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.org.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/org";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/org";
 
 message Org {
     string id = 1 [
diff --git a/proto/zitadel/org/v2/org.proto b/proto/zitadel/org/v2/org.proto
index 1f23b85eb5..7e58322d59 100644
--- a/proto/zitadel/org/v2/org.proto
+++ b/proto/zitadel/org/v2/org.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.org.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/org/v2;org";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/org/v2;org";
 
 import "google/api/field_behavior.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/proto/zitadel/org/v2/org_service.proto b/proto/zitadel/org/v2/org_service.proto
index 3917fc85a6..fb10915b2a 100644
--- a/proto/zitadel/org/v2/org_service.proto
+++ b/proto/zitadel/org/v2/org_service.proto
@@ -20,7 +20,7 @@ import "validate/validate.proto";
 import "zitadel/org/v2/org.proto";
 import "zitadel/org/v2/query.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/org/v2;org";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/org/v2;org";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -34,7 +34,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/org/v2/query.proto b/proto/zitadel/org/v2/query.proto
index bf0d8fb92a..44ac389b76 100644
--- a/proto/zitadel/org/v2/query.proto
+++ b/proto/zitadel/org/v2/query.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.org.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/org/v2;org";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/org/v2;org";
 
 import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
diff --git a/proto/zitadel/org/v2beta/org_service.proto b/proto/zitadel/org/v2beta/org_service.proto
index 132f0f1f30..5d71c30f85 100644
--- a/proto/zitadel/org/v2beta/org_service.proto
+++ b/proto/zitadel/org/v2beta/org_service.proto
@@ -19,7 +19,7 @@ import "google/protobuf/struct.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/org/v2beta;org";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/org/v2beta;org";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -33,7 +33,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/policy.proto b/proto/zitadel/policy.proto
index 2bce22e2fd..a196b1dcf0 100644
--- a/proto/zitadel/policy.proto
+++ b/proto/zitadel/policy.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 
 package zitadel.policy.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/policy";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/policy";
 
 //deprecated: please use DomainPolicy instead
 message OrgIAMPolicy {
diff --git a/proto/zitadel/project.proto b/proto/zitadel/project.proto
index b487a2dd34..f6d38df334 100644
--- a/proto/zitadel/project.proto
+++ b/proto/zitadel/project.proto
@@ -6,7 +6,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.project.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/project";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/project";
 
 message Project {
     string id = 1 [
diff --git a/proto/zitadel/protoc_gen_zitadel/v2/options.proto b/proto/zitadel/protoc_gen_zitadel/v2/options.proto
index 6ab648e74c..fc0eb68d11 100644
--- a/proto/zitadel/protoc_gen_zitadel/v2/options.proto
+++ b/proto/zitadel/protoc_gen_zitadel/v2/options.proto
@@ -4,7 +4,7 @@ package zitadel.protoc_gen_zitadel.v2;
 
 import "google/protobuf/descriptor.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/protoc/v2;protoc";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/protoc/v2;protoc";
 
 extend google.protobuf.MethodOptions {
   Options options = 50001;
diff --git a/proto/zitadel/quota.proto b/proto/zitadel/quota.proto
index 6323c78c51..be0e361f94 100644
--- a/proto/zitadel/quota.proto
+++ b/proto/zitadel/quota.proto
@@ -5,7 +5,7 @@ import "validate/validate.proto";
 
 package zitadel.quota.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/quota";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/quota";
 
 enum Unit {
     UNIT_UNIMPLEMENTED = 0;
diff --git a/proto/zitadel/resources/action/v3alpha/action_service.proto b/proto/zitadel/resources/action/v3alpha/action_service.proto
index fa07a9f854..9d00ae1eb4 100644
--- a/proto/zitadel/resources/action/v3alpha/action_service.proto
+++ b/proto/zitadel/resources/action/v3alpha/action_service.proto
@@ -17,7 +17,7 @@ import "zitadel/resources/action/v3alpha/query.proto";
 import "zitadel/resources/object/v3alpha/object.proto";
 import "zitadel/object/v3alpha/object.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/action/v3alpha;action";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/action/v3alpha;action";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -31,7 +31,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/resources/action/v3alpha/execution.proto b/proto/zitadel/resources/action/v3alpha/execution.proto
index 375ab02b86..5ff57e7ed7 100644
--- a/proto/zitadel/resources/action/v3alpha/execution.proto
+++ b/proto/zitadel/resources/action/v3alpha/execution.proto
@@ -14,7 +14,7 @@ import "zitadel/resources/object/v3alpha/object.proto";
 import "google/protobuf/timestamp.proto";
 import "zitadel/object/v3alpha/object.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/action/v3alpha;action";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/action/v3alpha;action";
 
 message Execution {
   // Ordered list of targets/includes called during the execution.
diff --git a/proto/zitadel/resources/action/v3alpha/query.proto b/proto/zitadel/resources/action/v3alpha/query.proto
index fb51543085..737b8101ab 100644
--- a/proto/zitadel/resources/action/v3alpha/query.proto
+++ b/proto/zitadel/resources/action/v3alpha/query.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.resources.action.v3alpha;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/action/v3alpha;action";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/action/v3alpha;action";
 
 import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
diff --git a/proto/zitadel/resources/action/v3alpha/target.proto b/proto/zitadel/resources/action/v3alpha/target.proto
index cb1ff85883..4090f4203f 100644
--- a/proto/zitadel/resources/action/v3alpha/target.proto
+++ b/proto/zitadel/resources/action/v3alpha/target.proto
@@ -12,7 +12,7 @@ import "zitadel/protoc_gen_zitadel/v2/options.proto";
 
 import "zitadel/resources/object/v3alpha/object.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/action/v3alpha;action";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/action/v3alpha;action";
 
 message Target {
   string name = 1 [
diff --git a/proto/zitadel/resources/debug_events/v3alpha/debug_events_service.proto b/proto/zitadel/resources/debug_events/v3alpha/debug_events_service.proto
index 6a5990f783..47a51f08ae 100644
--- a/proto/zitadel/resources/debug_events/v3alpha/debug_events_service.proto
+++ b/proto/zitadel/resources/debug_events/v3alpha/debug_events_service.proto
@@ -13,7 +13,7 @@ import "zitadel/resources/object/v3alpha/object.proto";
 import "zitadel/resources/debug_events/v3alpha/event.proto";
 import "zitadel/resources/debug_events/v3alpha/state.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/debug_events/v3alpha;debug_events";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/debug_events/v3alpha;debug_events";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -27,7 +27,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/resources/debug_events/v3alpha/event.proto b/proto/zitadel/resources/debug_events/v3alpha/event.proto
index 096c9918bb..8ef606f8fc 100644
--- a/proto/zitadel/resources/debug_events/v3alpha/event.proto
+++ b/proto/zitadel/resources/debug_events/v3alpha/event.proto
@@ -5,7 +5,7 @@ package zitadel.resources.debug_events.v3alpha;
 import "google/protobuf/duration.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/debug_events/v3alpha;debug_events";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/debug_events/v3alpha;debug_events";
 
 message Event {
   oneof event {
diff --git a/proto/zitadel/resources/debug_events/v3alpha/state.proto b/proto/zitadel/resources/debug_events/v3alpha/state.proto
index 5cdf60d740..e666d35018 100644
--- a/proto/zitadel/resources/debug_events/v3alpha/state.proto
+++ b/proto/zitadel/resources/debug_events/v3alpha/state.proto
@@ -4,7 +4,7 @@ package zitadel.resources.debug_events.v3alpha;
 
 import "zitadel/resources/object/v3alpha/object.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/debug_events/v3alpha;debug_events";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/debug_events/v3alpha;debug_events";
 
 message State {
   // Details provide some base information (such as the last change date) of the schema.
diff --git a/proto/zitadel/resources/object/v3alpha/object.proto b/proto/zitadel/resources/object/v3alpha/object.proto
index 17d536b5ec..2bac8769e9 100644
--- a/proto/zitadel/resources/object/v3alpha/object.proto
+++ b/proto/zitadel/resources/object/v3alpha/object.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.resources.object.v3alpha;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/object/v3alpha;object";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/object/v3alpha;object";
 
 import "google/api/field_behavior.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/proto/zitadel/resources/user/v3alpha/authenticator.proto b/proto/zitadel/resources/user/v3alpha/authenticator.proto
index eed57a414f..cc35ed5f1a 100644
--- a/proto/zitadel/resources/user/v3alpha/authenticator.proto
+++ b/proto/zitadel/resources/user/v3alpha/authenticator.proto
@@ -9,7 +9,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 import "zitadel/resources/object/v3alpha/object.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/user/v3alpha;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/user/v3alpha;user";
 
 message Authenticators {
   // All of the user's usernames, which will be used for identification during authentication.
diff --git a/proto/zitadel/resources/user/v3alpha/communication.proto b/proto/zitadel/resources/user/v3alpha/communication.proto
index b27379cf1a..98e337c500 100644
--- a/proto/zitadel/resources/user/v3alpha/communication.proto
+++ b/proto/zitadel/resources/user/v3alpha/communication.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.resources.user.v3alpha;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/user/v3alpha;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/user/v3alpha;user";
 
 import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
diff --git a/proto/zitadel/resources/user/v3alpha/query.proto b/proto/zitadel/resources/user/v3alpha/query.proto
index 4fffe517e2..06b4cedbe1 100644
--- a/proto/zitadel/resources/user/v3alpha/query.proto
+++ b/proto/zitadel/resources/user/v3alpha/query.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.resources.user.v3alpha;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/user/v3alpha;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/user/v3alpha;user";
 
 import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
diff --git a/proto/zitadel/resources/user/v3alpha/user.proto b/proto/zitadel/resources/user/v3alpha/user.proto
index 1be5f3c3f3..416f1cff59 100644
--- a/proto/zitadel/resources/user/v3alpha/user.proto
+++ b/proto/zitadel/resources/user/v3alpha/user.proto
@@ -11,7 +11,7 @@ import "zitadel/resources/object/v3alpha/object.proto";
 import "zitadel/resources/user/v3alpha/authenticator.proto";
 import "zitadel/resources/user/v3alpha/communication.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/user/v3alpha;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/user/v3alpha;user";
 
 message CreateUser {
   // Define the schema the user's data schema by providing it's ID.
diff --git a/proto/zitadel/resources/user/v3alpha/user_service.proto b/proto/zitadel/resources/user/v3alpha/user_service.proto
index 91831bdc40..c4870b2650 100644
--- a/proto/zitadel/resources/user/v3alpha/user_service.proto
+++ b/proto/zitadel/resources/user/v3alpha/user_service.proto
@@ -16,7 +16,7 @@ import "zitadel/resources/user/v3alpha/communication.proto";
 import "zitadel/resources/user/v3alpha/query.proto";
 import "zitadel/resources/user/v3alpha/user.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/user/v3alpha;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/user/v3alpha;user";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -30,7 +30,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/resources/userschema/v3alpha/user_schema.proto b/proto/zitadel/resources/userschema/v3alpha/user_schema.proto
index d9c2e30918..53e0275da8 100644
--- a/proto/zitadel/resources/userschema/v3alpha/user_schema.proto
+++ b/proto/zitadel/resources/userschema/v3alpha/user_schema.proto
@@ -8,7 +8,7 @@ import "validate/validate.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/resources/object/v3alpha/object.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/userschema/v3alpha;userschema";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/userschema/v3alpha;userschema";
 
 message GetUserSchema {
   // Details provide some base information (such as the last change date) of the schema.
diff --git a/proto/zitadel/resources/userschema/v3alpha/user_schema_service.proto b/proto/zitadel/resources/userschema/v3alpha/user_schema_service.proto
index ae9ef6ec8b..db295a8dc2 100644
--- a/proto/zitadel/resources/userschema/v3alpha/user_schema_service.proto
+++ b/proto/zitadel/resources/userschema/v3alpha/user_schema_service.proto
@@ -13,7 +13,7 @@ import "zitadel/resources/object/v3alpha/object.proto";
 import "zitadel/protoc_gen_zitadel/v2/options.proto";
 import "zitadel/resources/userschema/v3alpha/user_schema.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/userschema/v3alpha;userschema";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/userschema/v3alpha;userschema";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -27,7 +27,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/resources/webkey/v3alpha/config.proto b/proto/zitadel/resources/webkey/v3alpha/config.proto
index 170334afa5..027b2a50dc 100644
--- a/proto/zitadel/resources/webkey/v3alpha/config.proto
+++ b/proto/zitadel/resources/webkey/v3alpha/config.proto
@@ -4,7 +4,7 @@ package zitadel.resources.webkey.v3alpha;
 
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/webkey/v3alpha;webkey";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/webkey/v3alpha;webkey";
 
 message WebKeyRSAConfig {
   enum RSABits {
diff --git a/proto/zitadel/resources/webkey/v3alpha/key.proto b/proto/zitadel/resources/webkey/v3alpha/key.proto
index 47486f7aee..75f26b7981 100644
--- a/proto/zitadel/resources/webkey/v3alpha/key.proto
+++ b/proto/zitadel/resources/webkey/v3alpha/key.proto
@@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto";
 import "zitadel/resources/webkey/v3alpha/config.proto";
 import "zitadel/resources/object/v3alpha/object.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/webkey/v3alpha;webkey";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/webkey/v3alpha;webkey";
 
 enum WebKeyState {
   STATE_UNSPECIFIED = 0;
diff --git a/proto/zitadel/resources/webkey/v3alpha/webkey_service.proto b/proto/zitadel/resources/webkey/v3alpha/webkey_service.proto
index 43d2edab2b..5cd4f3c1fd 100644
--- a/proto/zitadel/resources/webkey/v3alpha/webkey_service.proto
+++ b/proto/zitadel/resources/webkey/v3alpha/webkey_service.proto
@@ -13,7 +13,7 @@ import "zitadel/resources/webkey/v3alpha/key.proto";
 import "zitadel/resources/object/v3alpha/object.proto";
 import "zitadel/object/v3alpha/object.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/resources/webkey/v3alpha;webkey";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/resources/webkey/v3alpha;webkey";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -27,7 +27,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/session/v2/challenge.proto b/proto/zitadel/session/v2/challenge.proto
index 77a73e8e68..24cdeebe51 100644
--- a/proto/zitadel/session/v2/challenge.proto
+++ b/proto/zitadel/session/v2/challenge.proto
@@ -7,7 +7,7 @@ import "google/protobuf/struct.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/session/v2;session";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/session/v2;session";
 
 enum UserVerificationRequirement {
   USER_VERIFICATION_REQUIREMENT_UNSPECIFIED = 0;
diff --git a/proto/zitadel/session/v2/session.proto b/proto/zitadel/session/v2/session.proto
index 2c17d81f99..f9f458e0ff 100644
--- a/proto/zitadel/session/v2/session.proto
+++ b/proto/zitadel/session/v2/session.proto
@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/session/v2;session";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/session/v2;session";
 
 message Session {
   string id = 1 [
diff --git a/proto/zitadel/session/v2/session_service.proto b/proto/zitadel/session/v2/session_service.proto
index f531c0a593..0817067f9b 100644
--- a/proto/zitadel/session/v2/session_service.proto
+++ b/proto/zitadel/session/v2/session_service.proto
@@ -14,7 +14,7 @@ import "google/protobuf/duration.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/session/v2;session";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/session/v2;session";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -28,7 +28,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/session/v2beta/challenge.proto b/proto/zitadel/session/v2beta/challenge.proto
index aa8a5a549b..95ddcd102a 100644
--- a/proto/zitadel/session/v2beta/challenge.proto
+++ b/proto/zitadel/session/v2beta/challenge.proto
@@ -7,7 +7,7 @@ import "google/protobuf/struct.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/session/v2beta;session";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/session/v2beta;session";
 
 enum UserVerificationRequirement {
   USER_VERIFICATION_REQUIREMENT_UNSPECIFIED = 0;
diff --git a/proto/zitadel/session/v2beta/session.proto b/proto/zitadel/session/v2beta/session.proto
index f1d894f671..345c29e5f7 100644
--- a/proto/zitadel/session/v2beta/session.proto
+++ b/proto/zitadel/session/v2beta/session.proto
@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/session/v2beta;session";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/session/v2beta;session";
 
 message Session {
   string id = 1 [
diff --git a/proto/zitadel/session/v2beta/session_service.proto b/proto/zitadel/session/v2beta/session_service.proto
index 6a2e731a94..46e7b7012a 100644
--- a/proto/zitadel/session/v2beta/session_service.proto
+++ b/proto/zitadel/session/v2beta/session_service.proto
@@ -14,7 +14,7 @@ import "google/protobuf/duration.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/session/v2beta;session";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/session/v2beta;session";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -28,7 +28,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/settings.proto b/proto/zitadel/settings.proto
index a2a6806c65..55bb79cd44 100644
--- a/proto/zitadel/settings.proto
+++ b/proto/zitadel/settings.proto
@@ -7,7 +7,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.settings.v1;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings";
 
 message SecretGenerator {
   SecretGeneratorType generator_type = 1;
diff --git a/proto/zitadel/settings/object/v3alpha/object.proto b/proto/zitadel/settings/object/v3alpha/object.proto
index 722db643d4..b1cc6823ef 100644
--- a/proto/zitadel/settings/object/v3alpha/object.proto
+++ b/proto/zitadel/settings/object/v3alpha/object.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.object.v3alpha;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/object/v3alpha;object";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/object/v3alpha;object";
 
 import "google/protobuf/timestamp.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
diff --git a/proto/zitadel/settings/v2/branding_settings.proto b/proto/zitadel/settings/v2/branding_settings.proto
index 84c4ecd755..d4e4a57e40 100644
--- a/proto/zitadel/settings/v2/branding_settings.proto
+++ b/proto/zitadel/settings/v2/branding_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2/settings.proto";
diff --git a/proto/zitadel/settings/v2/domain_settings.proto b/proto/zitadel/settings/v2/domain_settings.proto
index 0649e65ba1..0508666371 100644
--- a/proto/zitadel/settings/v2/domain_settings.proto
+++ b/proto/zitadel/settings/v2/domain_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2/settings.proto";
diff --git a/proto/zitadel/settings/v2/legal_settings.proto b/proto/zitadel/settings/v2/legal_settings.proto
index acd34e6ccb..feca62e5df 100644
--- a/proto/zitadel/settings/v2/legal_settings.proto
+++ b/proto/zitadel/settings/v2/legal_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2/settings.proto";
diff --git a/proto/zitadel/settings/v2/lockout_settings.proto b/proto/zitadel/settings/v2/lockout_settings.proto
index f4fefc2709..e78011bb82 100644
--- a/proto/zitadel/settings/v2/lockout_settings.proto
+++ b/proto/zitadel/settings/v2/lockout_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2/settings.proto";
diff --git a/proto/zitadel/settings/v2/login_settings.proto b/proto/zitadel/settings/v2/login_settings.proto
index ca004288fe..df3fe20f0a 100644
--- a/proto/zitadel/settings/v2/login_settings.proto
+++ b/proto/zitadel/settings/v2/login_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2/settings.proto";
diff --git a/proto/zitadel/settings/v2/password_settings.proto b/proto/zitadel/settings/v2/password_settings.proto
index d75ccec39e..1186368d57 100644
--- a/proto/zitadel/settings/v2/password_settings.proto
+++ b/proto/zitadel/settings/v2/password_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2/settings.proto";
diff --git a/proto/zitadel/settings/v2/security_settings.proto b/proto/zitadel/settings/v2/security_settings.proto
index 1045022bab..8831afa474 100644
--- a/proto/zitadel/settings/v2/security_settings.proto
+++ b/proto/zitadel/settings/v2/security_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 
diff --git a/proto/zitadel/settings/v2/settings.proto b/proto/zitadel/settings/v2/settings.proto
index b3ca5b5ca5..4575101a2a 100644
--- a/proto/zitadel/settings/v2/settings.proto
+++ b/proto/zitadel/settings/v2/settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 
diff --git a/proto/zitadel/settings/v2/settings_service.proto b/proto/zitadel/settings/v2/settings_service.proto
index cc8e5d05cc..4114eb2e5c 100644
--- a/proto/zitadel/settings/v2/settings_service.proto
+++ b/proto/zitadel/settings/v2/settings_service.proto
@@ -16,7 +16,7 @@ import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2;settings";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -30,7 +30,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/settings/v2beta/branding_settings.proto b/proto/zitadel/settings/v2beta/branding_settings.proto
index 4c50847f48..f6283652ff 100644
--- a/proto/zitadel/settings/v2beta/branding_settings.proto
+++ b/proto/zitadel/settings/v2beta/branding_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2beta;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2beta;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2beta/settings.proto";
diff --git a/proto/zitadel/settings/v2beta/domain_settings.proto b/proto/zitadel/settings/v2beta/domain_settings.proto
index 88787867b4..bb0d2048fc 100644
--- a/proto/zitadel/settings/v2beta/domain_settings.proto
+++ b/proto/zitadel/settings/v2beta/domain_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2beta;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2beta;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2beta/settings.proto";
diff --git a/proto/zitadel/settings/v2beta/legal_settings.proto b/proto/zitadel/settings/v2beta/legal_settings.proto
index 882a99cdba..01b2b0bc84 100644
--- a/proto/zitadel/settings/v2beta/legal_settings.proto
+++ b/proto/zitadel/settings/v2beta/legal_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2beta;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2beta;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2beta/settings.proto";
diff --git a/proto/zitadel/settings/v2beta/lockout_settings.proto b/proto/zitadel/settings/v2beta/lockout_settings.proto
index 1ff10c65f0..80f32bbb06 100644
--- a/proto/zitadel/settings/v2beta/lockout_settings.proto
+++ b/proto/zitadel/settings/v2beta/lockout_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2beta;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2beta;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2beta/settings.proto";
diff --git a/proto/zitadel/settings/v2beta/login_settings.proto b/proto/zitadel/settings/v2beta/login_settings.proto
index a31c058931..29986fceae 100644
--- a/proto/zitadel/settings/v2beta/login_settings.proto
+++ b/proto/zitadel/settings/v2beta/login_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2beta;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2beta;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2beta/settings.proto";
diff --git a/proto/zitadel/settings/v2beta/password_settings.proto b/proto/zitadel/settings/v2beta/password_settings.proto
index f4dfde4f60..22dff0eeff 100644
--- a/proto/zitadel/settings/v2beta/password_settings.proto
+++ b/proto/zitadel/settings/v2beta/password_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2beta;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2beta;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "zitadel/settings/v2beta/settings.proto";
diff --git a/proto/zitadel/settings/v2beta/security_settings.proto b/proto/zitadel/settings/v2beta/security_settings.proto
index c2d5302913..deec9277b3 100644
--- a/proto/zitadel/settings/v2beta/security_settings.proto
+++ b/proto/zitadel/settings/v2beta/security_settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2beta;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2beta;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 
diff --git a/proto/zitadel/settings/v2beta/settings.proto b/proto/zitadel/settings/v2beta/settings.proto
index 9ad4f0e469..e810d94960 100644
--- a/proto/zitadel/settings/v2beta/settings.proto
+++ b/proto/zitadel/settings/v2beta/settings.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.settings.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2beta;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2beta;settings";
 
 import "protoc-gen-openapiv2/options/annotations.proto";
 
diff --git a/proto/zitadel/settings/v2beta/settings_service.proto b/proto/zitadel/settings/v2beta/settings_service.proto
index 88331ddc54..88561088de 100644
--- a/proto/zitadel/settings/v2beta/settings_service.proto
+++ b/proto/zitadel/settings/v2beta/settings_service.proto
@@ -16,7 +16,7 @@ import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/settings/v2beta;settings";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/settings/v2beta;settings";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -30,7 +30,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/system.proto b/proto/zitadel/system.proto
index 8e199aa505..e8060fcde7 100644
--- a/proto/zitadel/system.proto
+++ b/proto/zitadel/system.proto
@@ -16,7 +16,7 @@ import "validate/validate.proto";
 
 package zitadel.system.v1;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/system";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/system";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -30,7 +30,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   tags: [
diff --git a/proto/zitadel/text.proto b/proto/zitadel/text.proto
index b9174fc44c..16c2c39a25 100644
--- a/proto/zitadel/text.proto
+++ b/proto/zitadel/text.proto
@@ -6,7 +6,7 @@ import "validate/validate.proto";
 
 package zitadel.text.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/text";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/text";
 
 message MessageCustomText {
     zitadel.v1.ObjectDetails details = 1;
diff --git a/proto/zitadel/user.proto b/proto/zitadel/user.proto
index 569c2ce97e..7e3a827d36 100644
--- a/proto/zitadel/user.proto
+++ b/proto/zitadel/user.proto
@@ -8,7 +8,7 @@ import "protoc-gen-openapiv2/options/annotations.proto";
 
 package zitadel.user.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/user";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/user";
 
 message User {
     string id = 1 [
diff --git a/proto/zitadel/user/v2/auth.proto b/proto/zitadel/user/v2/auth.proto
index ff72ecbba8..dd43b65b6e 100644
--- a/proto/zitadel/user/v2/auth.proto
+++ b/proto/zitadel/user/v2/auth.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2;user";
 
 import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
diff --git a/proto/zitadel/user/v2/email.proto b/proto/zitadel/user/v2/email.proto
index cbc07b8762..2dc87108d0 100644
--- a/proto/zitadel/user/v2/email.proto
+++ b/proto/zitadel/user/v2/email.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2;user";
 
 import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
diff --git a/proto/zitadel/user/v2/idp.proto b/proto/zitadel/user/v2/idp.proto
index 73e633fb67..39be4f2a1a 100644
--- a/proto/zitadel/user/v2/idp.proto
+++ b/proto/zitadel/user/v2/idp.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2;user";
 
 import "google/api/field_behavior.proto";
 import "google/protobuf/struct.proto";
diff --git a/proto/zitadel/user/v2/password.proto b/proto/zitadel/user/v2/password.proto
index e306788f4c..e2ece556e7 100644
--- a/proto/zitadel/user/v2/password.proto
+++ b/proto/zitadel/user/v2/password.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2;user";
 
 import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
diff --git a/proto/zitadel/user/v2/phone.proto b/proto/zitadel/user/v2/phone.proto
index 115cfdbdc0..a547e8f4e1 100644
--- a/proto/zitadel/user/v2/phone.proto
+++ b/proto/zitadel/user/v2/phone.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2;user";
 
 import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
diff --git a/proto/zitadel/user/v2/query.proto b/proto/zitadel/user/v2/query.proto
index 53f3446bca..69ca564395 100644
--- a/proto/zitadel/user/v2/query.proto
+++ b/proto/zitadel/user/v2/query.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2;user";
 
 import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
diff --git a/proto/zitadel/user/v2/user.proto b/proto/zitadel/user/v2/user.proto
index e1e98eb036..14533f2330 100644
--- a/proto/zitadel/user/v2/user.proto
+++ b/proto/zitadel/user/v2/user.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2;user";
 
 import "google/api/field_behavior.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/proto/zitadel/user/v2/user_service.proto b/proto/zitadel/user/v2/user_service.proto
index 20d3b65b67..d7c3c097fb 100644
--- a/proto/zitadel/user/v2/user_service.proto
+++ b/proto/zitadel/user/v2/user_service.proto
@@ -18,7 +18,7 @@ import "google/protobuf/struct.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2;user";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -32,7 +32,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/user/v2beta/auth.proto b/proto/zitadel/user/v2beta/auth.proto
index dd5a214063..587c1ba48b 100644
--- a/proto/zitadel/user/v2beta/auth.proto
+++ b/proto/zitadel/user/v2beta/auth.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2beta;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2beta;user";
 
 import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
diff --git a/proto/zitadel/user/v2beta/email.proto b/proto/zitadel/user/v2beta/email.proto
index 33473f3168..f3ae4dc8ba 100644
--- a/proto/zitadel/user/v2beta/email.proto
+++ b/proto/zitadel/user/v2beta/email.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2beta;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2beta;user";
 
 import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
diff --git a/proto/zitadel/user/v2beta/idp.proto b/proto/zitadel/user/v2beta/idp.proto
index 7d58ec5363..791b251955 100644
--- a/proto/zitadel/user/v2beta/idp.proto
+++ b/proto/zitadel/user/v2beta/idp.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2beta;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2beta;user";
 
 import "google/api/field_behavior.proto";
 import "google/protobuf/struct.proto";
diff --git a/proto/zitadel/user/v2beta/password.proto b/proto/zitadel/user/v2beta/password.proto
index 69fe5fc303..410ef3170a 100644
--- a/proto/zitadel/user/v2beta/password.proto
+++ b/proto/zitadel/user/v2beta/password.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2beta;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2beta;user";
 
 import "google/api/field_behavior.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
diff --git a/proto/zitadel/user/v2beta/phone.proto b/proto/zitadel/user/v2beta/phone.proto
index c71a725b29..fa26cc4376 100644
--- a/proto/zitadel/user/v2beta/phone.proto
+++ b/proto/zitadel/user/v2beta/phone.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2beta;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2beta;user";
 
 import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
diff --git a/proto/zitadel/user/v2beta/query.proto b/proto/zitadel/user/v2beta/query.proto
index e339cdde71..0b2e79b525 100644
--- a/proto/zitadel/user/v2beta/query.proto
+++ b/proto/zitadel/user/v2beta/query.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2beta;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2beta;user";
 
 import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
diff --git a/proto/zitadel/user/v2beta/user.proto b/proto/zitadel/user/v2beta/user.proto
index 9f1fd8a8c7..5482ef96a8 100644
--- a/proto/zitadel/user/v2beta/user.proto
+++ b/proto/zitadel/user/v2beta/user.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package zitadel.user.v2beta;
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2beta;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2beta;user";
 
 import "google/api/field_behavior.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/proto/zitadel/user/v2beta/user_service.proto b/proto/zitadel/user/v2beta/user_service.proto
index f4ee9e5f3c..b9fb04a593 100644
--- a/proto/zitadel/user/v2beta/user_service.proto
+++ b/proto/zitadel/user/v2beta/user_service.proto
@@ -18,7 +18,7 @@ import "google/protobuf/struct.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "github.com/zitadel/zitadel/pkg/grpc/user/v2beta;user";
+option go_package = "github.com/zitadel/zitadel/v2/pkg/grpc/user/v2beta;user";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
   info: {
@@ -32,7 +32,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     }
     license: {
       name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSE";
+      url: "https://github.com/zitadel/zitadel/v2/blob/main/LICENSE";
     };
   };
   schemes: HTTPS;
diff --git a/proto/zitadel/v1.proto b/proto/zitadel/v1.proto
index c186ea7d61..af33ee1de2 100644
--- a/proto/zitadel/v1.proto
+++ b/proto/zitadel/v1.proto
@@ -14,7 +14,7 @@ import "validate/validate.proto";
 
 package zitadel.v1.v1;
 
-option go_package ="github.com/zitadel/zitadel/pkg/grpc/v1";
+option go_package ="github.com/zitadel/zitadel/v2/pkg/grpc/v1";
 
 message AddCustomOrgIAMPolicyRequest {
   option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema) = {