diff --git a/kardinal-cli/cmd/table_printer.go b/kardinal-cli/cmd/table_printer.go
index 486b64e0..0109469d 100644
--- a/kardinal-cli/cmd/table_printer.go
+++ b/kardinal-cli/cmd/table_printer.go
@@ -33,13 +33,18 @@ func printTemplateTable(templates []api_types.Template) {
 // Update the existing printFlowTable function to use the new generic function
 func printFlowTable(flows []api_types.Flow) {
 	data := lo.Map(flows, func(flow api_types.Flow, _ int) []string {
+		templateName := "default"
+		if flow.TemplateName != nil {
+			templateName = *flow.TemplateName
+		}
 		return []string{
 			flow.FlowId,
 			strings.Join(lo.Map(flow.FlowUrls, func(item string, _ int) string { return fmt.Sprintf("http://%s", item) }), ", "),
+			templateName,
 		}
 	})
 
-	header := []string{"Flow ID", "Flow URL"}
+	header := []string{"Flow ID", "Flow URL", "Template"}
 	printGenericTable(header, data)
 }
 
diff --git a/libs/cli-kontrol-api/api/golang/server/server.gen.go b/libs/cli-kontrol-api/api/golang/server/server.gen.go
index 9f0d546f..4b572787 100644
--- a/libs/cli-kontrol-api/api/golang/server/server.gen.go
+++ b/libs/cli-kontrol-api/api/golang/server/server.gen.go
@@ -857,30 +857,30 @@ func (sh *strictHandler) GetTenantUuidTopology(ctx echo.Context, uuid Uuid) erro
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"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",
+	"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",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file
diff --git a/libs/cli-kontrol-api/api/golang/types/types.gen.go b/libs/cli-kontrol-api/api/golang/types/types.gen.go
index 366f9e7c..9bb1302f 100644
--- a/libs/cli-kontrol-api/api/golang/types/types.gen.go
+++ b/libs/cli-kontrol-api/api/golang/types/types.gen.go
@@ -37,8 +37,9 @@ type Edge struct {
 
 // Flow defines model for Flow.
 type Flow struct {
-	FlowId   string   `json:"flow-id"`
-	FlowUrls []string `json:"flow-urls"`
+	FlowId       string   `json:"flow-id"`
+	FlowUrls     []string `json:"flow-urls"`
+	TemplateName *string  `json:"template-name,omitempty"`
 }
 
 // FlowSpec defines model for FlowSpec.
diff --git a/libs/cli-kontrol-api/api/typescript/client/types.d.ts b/libs/cli-kontrol-api/api/typescript/client/types.d.ts
index 4a149529..77ae51d9 100644
--- a/libs/cli-kontrol-api/api/typescript/client/types.d.ts
+++ b/libs/cli-kontrol-api/api/typescript/client/types.d.ts
@@ -202,6 +202,7 @@ export interface components {
     Flow: {
       "flow-id": string;
       "flow-urls": string[];
+      "template-name"?: string;
     };
     FlowSpec: {
         /** @example backend-a:latest */
diff --git a/libs/cli-kontrol-api/specs/api.yaml b/libs/cli-kontrol-api/specs/api.yaml
index 6c66e256..6b5fbd6d 100644
--- a/libs/cli-kontrol-api/specs/api.yaml
+++ b/libs/cli-kontrol-api/specs/api.yaml
@@ -254,6 +254,8 @@ components:
           type: array
           items:
             type: string
+        template-name:
+          type: string
       required:
         - flow-id
         - flow-urls