diff --git a/cloud/deployment/deployment_token.go b/cloud/deployment/deployment_token.go
index b70930187..6fddf4b3d 100644
--- a/cloud/deployment/deployment_token.go
+++ b/cloud/deployment/deployment_token.go
@@ -33,14 +33,14 @@ const (
 func newTokenTableOut() *printutil.Table {
 	return &printutil.Table{
 		DynamicPadding: true,
-		Header:         []string{"ID", "NAME", "DESCRIPTION", "SCOPE", "DEPLOYMENT ROLE", "CREATED", "CREATED BY"},
+		Header:         []string{"ID", "NAME", "DESCRIPTION", "SCOPE", "TYPE", "DEPLOYMENT ROLE", "CREATED", "CREATED BY"},
 	}
 }
 
 func newTokenSelectionTableOut() *printutil.Table {
 	return &printutil.Table{
 		DynamicPadding: true,
-		Header:         []string{"#", "ID", "NAME", "DESCRIPTION", "SCOPE", "DEPLOYMENT ROLE", "CREATED", "CREATED BY"},
+		Header:         []string{"#", "ID", "NAME", "DESCRIPTION", "SCOPE", "TYPE", "DEPLOYMENT ROLE", "CREATED", "CREATED BY"},
 	}
 }
 
@@ -123,6 +123,7 @@ func ListTokens(client astrov1.APIClient, deploymentID string, tokenTypes *[]Dep
 			apiTokens[i].Name,
 			apiTokens[i].Description,
 			string(apiTokens[i].Scope),
+			string(apiTokens[i].Kind),
 			deploymentRoleOf(apiTokens[i], deploymentID),
 			created,
 			createdBy,
@@ -360,6 +361,7 @@ func selectTokens(deploymentID string, apiTokens []astrov1.ApiToken) (astrov1.Ap
 			apiTokens[i].Name,
 			apiTokens[i].Description,
 			string(apiTokens[i].Scope),
+			string(apiTokens[i].Kind),
 			deploymentRoleOf(apiTokens[i], deploymentID),
 			created,
 			createdBy,
diff --git a/cloud/organization/organization_token.go b/cloud/organization/organization_token.go
index 5672f6685..3b11b10e4 100644
--- a/cloud/organization/organization_token.go
+++ b/cloud/organization/organization_token.go
@@ -35,7 +35,7 @@ const (
 func newTokenTableOut() *printutil.Table {
 	return &printutil.Table{
 		DynamicPadding: true,
-		Header:         []string{"ID", "NAME", "DESCRIPTION", "SCOPE", "ORGANIZATION ROLE", "CREATED", "CREATED BY"},
+		Header:         []string{"ID", "NAME", "DESCRIPTION", "SCOPE", "TYPE", "ORGANIZATION ROLE", "CREATED", "CREATED BY"},
 	}
 }
 
@@ -263,6 +263,7 @@ func ListTokens(client astrov1.APIClient, out io.Writer) error {
 			apiTokens[i].Name,
 			apiTokens[i].Description,
 			string(apiTokens[i].Scope),
+			string(apiTokens[i].Kind),
 			orgRoleOf(apiTokens[i]),
 			created,
 			createdBy,
diff --git a/cloud/workspace-token/workspace_token.go b/cloud/workspace-token/workspace_token.go
index 1bab31909..716b4ee5e 100644
--- a/cloud/workspace-token/workspace_token.go
+++ b/cloud/workspace-token/workspace_token.go
@@ -34,14 +34,14 @@ const (
 func newTokenTableOut() *printutil.Table {
 	return &printutil.Table{
 		DynamicPadding: true,
-		Header:         []string{"ID", "NAME", "DESCRIPTION", "SCOPE", "WORKSPACE ROLE", "CREATED", "CREATED BY"},
+		Header:         []string{"ID", "NAME", "DESCRIPTION", "SCOPE", "TYPE", "WORKSPACE ROLE", "CREATED", "CREATED BY"},
 	}
 }
 
 func newTokenSelectionTableOut() *printutil.Table {
 	return &printutil.Table{
 		DynamicPadding: true,
-		Header:         []string{"#", "ID", "NAME", "DESCRIPTION", "SCOPE", "WORKSPACE ROLE", "CREATED", "CREATED BY"},
+		Header:         []string{"#", "ID", "NAME", "DESCRIPTION", "SCOPE", "TYPE", "WORKSPACE ROLE", "CREATED", "CREATED BY"},
 	}
 }
 
@@ -133,6 +133,7 @@ func ListTokens(client astrov1.APIClient, workspaceID string, tokenTypes *[]Toke
 			apiTokens[i].Name,
 			apiTokens[i].Description,
 			string(apiTokens[i].Scope),
+			string(apiTokens[i].Kind),
 			workspaceRoleOf(apiTokens[i], workspaceID),
 			created,
 			createdBy,
@@ -393,6 +394,7 @@ func selectTokens(workspaceID string, apiTokens []astrov1.ApiToken) (astrov1.Api
 			apiTokens[i].Name,
 			apiTokens[i].Description,
 			string(apiTokens[i].Scope),
+			string(apiTokens[i].Kind),
 			workspaceRoleOf(apiTokens[i], workspaceID),
 			created,
 			createdBy,