diff --git a/backend/src/server/routes/v1/admin-router.ts b/backend/src/server/routes/v1/admin-router.ts
index d0303a33c..6eb1804f1 100644
--- a/backend/src/server/routes/v1/admin-router.ts
+++ b/backend/src/server/routes/v1/admin-router.ts
@@ -486,9 +486,23 @@ export const registerAdminRouter = async (server: FastifyZodProvider) => {
       response: {
         200: z.object({
           message: z.string(),
-          user: UsersSchema,
-          organization: OrganizationsSchema,
-          identity: IdentitiesSchema.extend({
+          user: UsersSchema.pick({
+            username: true,
+            firstName: true,
+            lastName: true,
+            email: true,
+            id: true,
+            superAdmin: true
+          }),
+          organization: OrganizationsSchema.pick({
+            id: true,
+            name: true,
+            slug: true
+          }),
+          identity: IdentitiesSchema.pick({
+            id: true,
+            name: true
+          }).extend({
             credentials: z.object({
               token: z.string()
             }) // would just be Token AUTH for now
diff --git a/cli/packages/api/api.go b/cli/packages/api/api.go
index 04fd8819e..ec92f2ad2 100644
--- a/cli/packages/api/api.go
+++ b/cli/packages/api/api.go
@@ -601,8 +601,8 @@ func CallGatewayHeartBeatV1(httpClient *resty.Client) error {
 	return nil
 }
 
-func CallBootstrapInstance(httpClient *resty.Client, request BootstrapInstanceRequest) (*BootstrapInstanceResponse, error) {
-	var resBody BootstrapInstanceResponse
+func CallBootstrapInstance(httpClient *resty.Client, request BootstrapInstanceRequest) (map[string]interface{}, error) {
+	var resBody map[string]interface{}
 	response, err := httpClient.
 		R().
 		SetResult(&resBody).
@@ -618,5 +618,5 @@ func CallBootstrapInstance(httpClient *resty.Client, request BootstrapInstanceRe
 		return nil, fmt.Errorf("CallBootstrapInstance: Unsuccessful response [%v %v] [status-code=%v] [response=%v]", response.Request.Method, response.Request.URL, response.StatusCode(), response.String())
 	}
 
-	return &resBody, nil
+	return resBody, nil
 }
diff --git a/cli/packages/api/model.go b/cli/packages/api/model.go
index dba6bc3c7..3e22ab908 100644
--- a/cli/packages/api/model.go
+++ b/cli/packages/api/model.go
@@ -661,20 +661,3 @@ type BootstrapInstanceRequest struct {
 	Organization string `json:"organization"`
 	Domain       string `json:"domain"`
 }
-
-type BootstrapInstanceResponseOrganization struct {
-	ID   string `json:"id"`
-	Name string `json:"name"`
-}
-
-type BootstrapInstanceResponseIdentity struct {
-	ID          string      `json:"id"`
-	Name        string      `json:"name"`
-	Credentials interface{} `json:"credentials"`
-}
-
-type BootstrapInstanceResponse struct {
-	Message      string                                `json:"message"`
-	Organization BootstrapInstanceResponseOrganization `json:"organization"`
-	Identity     BootstrapInstanceResponseIdentity     `json:"identity"`
-}