diff --git a/.changeset/six-jobs-sin.md b/.changeset/six-jobs-sin.md
new file mode 100644
index 0000000000..307190ae81
--- /dev/null
+++ b/.changeset/six-jobs-sin.md
@@ -0,0 +1,5 @@
+---
+'@backstage/catalog-client': patch
+---
+
+Internal updates to auto-generated files.
diff --git a/.changeset/tasty-feet-cheat.md b/.changeset/tasty-feet-cheat.md
new file mode 100644
index 0000000000..1e93439fa6
--- /dev/null
+++ b/.changeset/tasty-feet-cheat.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': patch
+---
+
+Fixes an issue where comments would be duplicated in the template. Also, removes a header with the title and version of the OpenAPI spec from generated code.
diff --git a/packages/catalog-client/src/generated/apis/DefaultApi.client.ts b/packages/catalog-client/src/generated/apis/DefaultApi.client.ts
index 8c78d4c721..14fc73ba83 100644
--- a/packages/catalog-client/src/generated/apis/DefaultApi.client.ts
+++ b/packages/catalog-client/src/generated/apis/DefaultApi.client.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { DiscoveryApi } from '../types/discovery';
 import { FetchApi } from '../types/fetch';
 import crossFetch from 'cross-fetch';
diff --git a/packages/catalog-client/src/generated/apis/index.ts b/packages/catalog-client/src/generated/apis/index.ts
index ad2f72c5b2..51dcca33fe 100644
--- a/packages/catalog-client/src/generated/apis/index.ts
+++ b/packages/catalog-client/src/generated/apis/index.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/packages/catalog-client/src/generated/index.ts b/packages/catalog-client/src/generated/index.ts
index 0cf3e9cc49..bb399e97a0 100644
--- a/packages/catalog-client/src/generated/index.ts
+++ b/packages/catalog-client/src/generated/index.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts b/packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts
index a1c1e1f669..48d2c897a7 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts
+++ b/packages/catalog-client/src/generated/models/AnalyzeLocationEntityField.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface AnalyzeLocationEntityField {
   /**
    * A text to show to the user to inform about the choices made. Like, it could say \"Found a CODEOWNERS file that covers this target, so we suggest leaving this field empty; which would currently make it owned by X\" where X is taken from the codeowners file.
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts b/packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts
index 5ede0fb60b..7a1417145e 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts
+++ b/packages/catalog-client/src/generated/models/AnalyzeLocationExistingEntity.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { Entity } from '../models/Entity.model';
 import { LocationSpec } from '../models/LocationSpec.model';
 
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts b/packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
index 886aac05d9..3e33c59330 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
+++ b/packages/catalog-client/src/generated/models/AnalyzeLocationGenerateEntity.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { AnalyzeLocationEntityField } from '../models/AnalyzeLocationEntityField.model';
 import { RecursivePartialEntity } from '../models/RecursivePartialEntity.model';
 
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts b/packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts
index e8e9542f5a..15e9b96e2c 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts
+++ b/packages/catalog-client/src/generated/models/AnalyzeLocationRequest.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { LocationInput } from '../models/LocationInput.model';
 
 export interface AnalyzeLocationRequest {
diff --git a/packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts b/packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts
index bf60aa8018..e22d45627a 100644
--- a/packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts
+++ b/packages/catalog-client/src/generated/models/AnalyzeLocationResponse.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { AnalyzeLocationExistingEntity } from '../models/AnalyzeLocationExistingEntity.model';
 import { AnalyzeLocationGenerateEntity } from '../models/AnalyzeLocationGenerateEntity.model';
 
diff --git a/packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts b/packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts
index d090d80bf2..367e701af8 100644
--- a/packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts
+++ b/packages/catalog-client/src/generated/models/CreateLocation201Response.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { Entity } from '../models/Entity.model';
 import { Location } from '../models/Location.model';
 
diff --git a/packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts b/packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts
index 6ef950072e..badddbf60d 100644
--- a/packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts
+++ b/packages/catalog-client/src/generated/models/CreateLocationRequest.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface CreateLocationRequest {
   target: string;
   type: string;
diff --git a/packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts b/packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts
index d09b2cc086..3275a7b6e7 100644
--- a/packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts
+++ b/packages/catalog-client/src/generated/models/EntitiesBatchResponse.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { NullableEntity } from '../models/NullableEntity.model';
 
 export interface EntitiesBatchResponse {
diff --git a/packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts b/packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts
index 10d4747caf..9950dd98d1 100644
--- a/packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts
+++ b/packages/catalog-client/src/generated/models/EntitiesQueryResponse.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { EntitiesQueryResponsePageInfo } from '../models/EntitiesQueryResponsePageInfo.model';
 import { Entity } from '../models/Entity.model';
 
diff --git a/packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts b/packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
index 8a7d5b39bb..4d2a0af058 100644
--- a/packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
+++ b/packages/catalog-client/src/generated/models/EntitiesQueryResponsePageInfo.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface EntitiesQueryResponsePageInfo {
   /**
    * The cursor for the next batch of entities.
diff --git a/packages/catalog-client/src/generated/models/Entity.model.ts b/packages/catalog-client/src/generated/models/Entity.model.ts
index 59ef9bc741..f4a30fbf66 100644
--- a/packages/catalog-client/src/generated/models/Entity.model.ts
+++ b/packages/catalog-client/src/generated/models/Entity.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { EntityMeta } from '../models/EntityMeta.model';
 import { EntityRelation } from '../models/EntityRelation.model';
 
diff --git a/packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts b/packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts
index 08076fcf36..4e0ead7d3b 100644
--- a/packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts
+++ b/packages/catalog-client/src/generated/models/EntityAncestryResponse.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { EntityAncestryResponseItemsInner } from '../models/EntityAncestryResponseItemsInner.model';
 
 export interface EntityAncestryResponse {
diff --git a/packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts b/packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts
index 7713c21295..22b59e201f 100644
--- a/packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts
+++ b/packages/catalog-client/src/generated/models/EntityAncestryResponseItemsInner.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { Entity } from '../models/Entity.model';
 
 export interface EntityAncestryResponseItemsInner {
diff --git a/packages/catalog-client/src/generated/models/EntityFacet.model.ts b/packages/catalog-client/src/generated/models/EntityFacet.model.ts
index 3872091d77..aa637501f4 100644
--- a/packages/catalog-client/src/generated/models/EntityFacet.model.ts
+++ b/packages/catalog-client/src/generated/models/EntityFacet.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface EntityFacet {
   value: string;
   count: number;
diff --git a/packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts b/packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts
index 0ff37e4f2f..33aa505a64 100644
--- a/packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts
+++ b/packages/catalog-client/src/generated/models/EntityFacetsResponse.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { EntityFacet } from '../models/EntityFacet.model';
 
 export interface EntityFacetsResponse {
diff --git a/packages/catalog-client/src/generated/models/EntityLink.model.ts b/packages/catalog-client/src/generated/models/EntityLink.model.ts
index f52f9f2df0..9de21c1b10 100644
--- a/packages/catalog-client/src/generated/models/EntityLink.model.ts
+++ b/packages/catalog-client/src/generated/models/EntityLink.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 /**
  * A link to external information that is related to the entity.
  */
diff --git a/packages/catalog-client/src/generated/models/EntityMeta.model.ts b/packages/catalog-client/src/generated/models/EntityMeta.model.ts
index cb0fd28fdc..10cda7f226 100644
--- a/packages/catalog-client/src/generated/models/EntityMeta.model.ts
+++ b/packages/catalog-client/src/generated/models/EntityMeta.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { EntityLink } from '../models/EntityLink.model';
 
 /**
@@ -21,6 +24,7 @@ import { EntityLink } from '../models/EntityLink.model';
  */
 export interface EntityMeta {
   [key: string]: any;
+
   /**
    * A list of external hyperlinks related to the entity.
    */
diff --git a/packages/catalog-client/src/generated/models/EntityRelation.model.ts b/packages/catalog-client/src/generated/models/EntityRelation.model.ts
index 1107f7563c..14f7d0fab3 100644
--- a/packages/catalog-client/src/generated/models/EntityRelation.model.ts
+++ b/packages/catalog-client/src/generated/models/EntityRelation.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 /**
  * A relation of a specific type to another entity in the catalog.
  */
diff --git a/packages/catalog-client/src/generated/models/ErrorError.model.ts b/packages/catalog-client/src/generated/models/ErrorError.model.ts
index 9dbfa22813..a9d3b11fdd 100644
--- a/packages/catalog-client/src/generated/models/ErrorError.model.ts
+++ b/packages/catalog-client/src/generated/models/ErrorError.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface ErrorError {
   name: string;
   message: string;
diff --git a/packages/catalog-client/src/generated/models/ErrorRequest.model.ts b/packages/catalog-client/src/generated/models/ErrorRequest.model.ts
index e6306b87f5..be62627814 100644
--- a/packages/catalog-client/src/generated/models/ErrorRequest.model.ts
+++ b/packages/catalog-client/src/generated/models/ErrorRequest.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface ErrorRequest {
   method: string;
   url: string;
diff --git a/packages/catalog-client/src/generated/models/ErrorResponse.model.ts b/packages/catalog-client/src/generated/models/ErrorResponse.model.ts
index 1f55c34b4a..008f8b7348 100644
--- a/packages/catalog-client/src/generated/models/ErrorResponse.model.ts
+++ b/packages/catalog-client/src/generated/models/ErrorResponse.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface ErrorResponse {
   statusCode: number;
 }
diff --git a/packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts b/packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts
index bdda7c2fa6..07c6500c9f 100644
--- a/packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts
+++ b/packages/catalog-client/src/generated/models/GetEntitiesByRefsRequest.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface GetEntitiesByRefsRequest {
   entityRefs: Array<string>;
   fields?: Array<string>;
diff --git a/packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts b/packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts
index 134306cce7..94c40d2233 100644
--- a/packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts
+++ b/packages/catalog-client/src/generated/models/GetLocations200ResponseInner.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { Location } from '../models/Location.model';
 
 export interface GetLocations200ResponseInner {
diff --git a/packages/catalog-client/src/generated/models/Location.model.ts b/packages/catalog-client/src/generated/models/Location.model.ts
index 27e47a5a25..456b76ec7b 100644
--- a/packages/catalog-client/src/generated/models/Location.model.ts
+++ b/packages/catalog-client/src/generated/models/Location.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 /**
  * Entity location for a specific entity.
  */
diff --git a/packages/catalog-client/src/generated/models/LocationInput.model.ts b/packages/catalog-client/src/generated/models/LocationInput.model.ts
index 8de7e3e6c9..41537aaded 100644
--- a/packages/catalog-client/src/generated/models/LocationInput.model.ts
+++ b/packages/catalog-client/src/generated/models/LocationInput.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface LocationInput {
   type: string;
   target: string;
diff --git a/packages/catalog-client/src/generated/models/LocationSpec.model.ts b/packages/catalog-client/src/generated/models/LocationSpec.model.ts
index 80db2cadf2..cd9eb284f7 100644
--- a/packages/catalog-client/src/generated/models/LocationSpec.model.ts
+++ b/packages/catalog-client/src/generated/models/LocationSpec.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 /**
  * Holds the entity location information.
  */
diff --git a/packages/catalog-client/src/generated/models/ModelError.model.ts b/packages/catalog-client/src/generated/models/ModelError.model.ts
index 989e755c9a..7bfa165493 100644
--- a/packages/catalog-client/src/generated/models/ModelError.model.ts
+++ b/packages/catalog-client/src/generated/models/ModelError.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { ErrorError } from '../models/ErrorError.model';
 import { ErrorRequest } from '../models/ErrorRequest.model';
 import { ErrorResponse } from '../models/ErrorResponse.model';
 
 export interface ModelError {
   [key: string]: any;
+
   error: ErrorError;
   request?: ErrorRequest;
   response: ErrorResponse;
diff --git a/packages/catalog-client/src/generated/models/NullableEntity.model.ts b/packages/catalog-client/src/generated/models/NullableEntity.model.ts
index 36aff86ba8..b4344a3bfb 100644
--- a/packages/catalog-client/src/generated/models/NullableEntity.model.ts
+++ b/packages/catalog-client/src/generated/models/NullableEntity.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { EntityMeta } from '../models/EntityMeta.model';
 import { EntityRelation } from '../models/EntityRelation.model';
 
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts b/packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts
index 8de7824550..db5ac31de3 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts
+++ b/packages/catalog-client/src/generated/models/RecursivePartialEntity.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { RecursivePartialEntityMeta } from '../models/RecursivePartialEntityMeta.model';
 import { RecursivePartialEntityRelation } from '../models/RecursivePartialEntityRelation.model';
 
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts b/packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts
index b21cc1bb21..93e849ac99 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts
+++ b/packages/catalog-client/src/generated/models/RecursivePartialEntityMeta.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { EntityLink } from '../models/EntityLink.model';
 
 export interface RecursivePartialEntityMeta {
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts b/packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
index 5111cd7f9f..7e06368102 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
+++ b/packages/catalog-client/src/generated/models/RecursivePartialEntityMetaAllOf.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { EntityLink } from '../models/EntityLink.model';
 
 /**
diff --git a/packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts b/packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts
index 50635b69f4..9179add222 100644
--- a/packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts
+++ b/packages/catalog-client/src/generated/models/RecursivePartialEntityRelation.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 /**
  * A relation of a specific type to another entity in the catalog.
  */
diff --git a/packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts b/packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts
index 573523385b..c5ab4c38eb 100644
--- a/packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts
+++ b/packages/catalog-client/src/generated/models/RefreshEntityRequest.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 /**
  * Options for requesting a refresh of entities in the catalog.
  */
diff --git a/packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts b/packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts
index 0031b2edc2..7cd5044782 100644
--- a/packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts
+++ b/packages/catalog-client/src/generated/models/ValidateEntity400Response.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
 import { ValidateEntity400ResponseErrorsInner } from '../models/ValidateEntity400ResponseErrorsInner.model';
 
 export interface ValidateEntity400Response {
diff --git a/packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts b/packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
index 6223df27af..5617ee00bb 100644
--- a/packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
+++ b/packages/catalog-client/src/generated/models/ValidateEntity400ResponseErrorsInner.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,13 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface ValidateEntity400ResponseErrorsInner {
   [key: string]: any;
+
   name: string;
   message: string;
 }
diff --git a/packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts b/packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts
index d5ce1be5c9..152f28cf85 100644
--- a/packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts
+++ b/packages/catalog-client/src/generated/models/ValidateEntityRequest.model.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
+
 export interface ValidateEntityRequest {
   location: string;
   entity: { [key: string]: any };
diff --git a/packages/catalog-client/src/generated/models/index.ts b/packages/catalog-client/src/generated/models/index.ts
index 5a93dbb33a..d6c81becb5 100644
--- a/packages/catalog-client/src/generated/models/index.ts
+++ b/packages/catalog-client/src/generated/models/index.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/packages/catalog-client/src/generated/pluginId.ts b/packages/catalog-client/src/generated/pluginId.ts
index c8c8ce1ca3..b45379f0b0 100644
--- a/packages/catalog-client/src/generated/pluginId.ts
+++ b/packages/catalog-client/src/generated/pluginId.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/packages/repo-tools/templates/typescript-backstage/licenseInfo.mustache b/packages/repo-tools/templates/typescript-backstage/licenseInfo.mustache
index afc90f6227..7a1b10e780 100644
--- a/packages/repo-tools/templates/typescript-backstage/licenseInfo.mustache
+++ b/packages/repo-tools/templates/typescript-backstage/licenseInfo.mustache
@@ -1,7 +1,5 @@
 //
 
-/**
- * {{{appName}}}{{#version}}@{{{.}}}{{/version}}
- * 
- * NOTE: This class is auto generated, do not edit the class manually.
- */
\ No newline at end of file
+// ******************************************************************
+// * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
+// ******************************************************************
\ No newline at end of file
diff --git a/packages/repo-tools/templates/typescript-backstage/model.mustache b/packages/repo-tools/templates/typescript-backstage/model.mustache
index 97d7858cb2..565eecb4e8 100644
--- a/packages/repo-tools/templates/typescript-backstage/model.mustache
+++ b/packages/repo-tools/templates/typescript-backstage/model.mustache
@@ -6,12 +6,6 @@
 import { {{classname}} } from '{{filename}}.model';
 {{/tsImports}}
 
-
-{{#description}}
-/**
- * {{{.}}}
- */
-{{/description}}
 {{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#isAlias}}{{>modelAlias}}{{/isAlias}}{{^isAlias}}{{#taggedUnions}}{{>modelTaggedUnion}}{{/taggedUnions}}{{^taggedUnions}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{^oneOf}}{{>modelGeneric}}{{/oneOf}}{{/taggedUnions}}{{/isAlias}}{{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/packages/repo-tools/templates/typescript-backstage/modelGenericAdditionalProperties.mustache b/packages/repo-tools/templates/typescript-backstage/modelGenericAdditionalProperties.mustache
index b8d7d1ceb7..e1e94cea80 100644
--- a/packages/repo-tools/templates/typescript-backstage/modelGenericAdditionalProperties.mustache
+++ b/packages/repo-tools/templates/typescript-backstage/modelGenericAdditionalProperties.mustache
@@ -1,7 +1,5 @@
 {{! Sourced from https://github.com/OpenAPITools/openapi-generator/blob/7347daec61b2cb8d3d28e1ed06fe8b5e682090f8/modules/openapi-generator/src/main/resources/typescript-angular/modelGenericAdditionalProperties.mustache }}
 
 {{#additionalPropertiesType}}
-
-  [key: string]: {{{additionalPropertiesType}}}{{#hasVars}} | any{{/hasVars}};
-
+  [key: string]: {{{additionalPropertiesType}}};
 {{/additionalPropertiesType}}
\ No newline at end of file