diff --git a/.github/scripts/schemas/aprl-schema.yaml b/.github/scripts/schemas/aprl-schema.yaml
index 0b8b9c1e9..2f26647cd 100644
--- a/.github/scripts/schemas/aprl-schema.yaml
+++ b/.github/scripts/schemas/aprl-schema.yaml
@@ -16,7 +16,7 @@ recommendation:
   potentialBenefits: str(max=60)
   pgVerified: bool()
   automationAvailable: bool()
-  tags: any(enum('AI','AVD', 'AVS', 'HPC', 'SAP'), null())
+  tags: list(any(enum('AI-GPT-RAG','AVD', 'AVS', 'HPC', 'SAP'), null()))
   learnMoreLink: list(include('linkItem'), required=False, min=1)
 
 linkItem:
diff --git a/azure-specialized-workloads/ai/recommendations.yaml b/azure-specialized-workloads/ai/recommendations.yaml
index a10a0dd1a..dbca8c208 100644
--- a/azure-specialized-workloads/ai/recommendations.yaml
+++ b/azure-specialized-workloads/ai/recommendations.yaml
@@ -10,7 +10,7 @@
   potentialBenefits: Monitoring endpoints gives visibility into metrics and logs
   pgVerified: false
   automationAvailable: false
-  tags: AI
+  tags: AI-GPT-RAG
   learnMoreLink:
     - name: Monitor online endpoints using Application Insights
       url: "https://learn.microsoft.com/en-us/azure/machine-learning/how-to-monitor-online-endpoints?view=azureml-api-2#using-application-insights"
@@ -27,7 +27,7 @@
   potentialBenefits: Provides monitoring and data retention in DR region
   pgVerified: false
   automationAvailable: false
-  tags: AI
+  tags: AI-GPT-RAG
   learnMoreLink:
     - name: Data collection, retention, and storage in Application Insights
       url: "https://learn.microsoft.com/en-us/azure/azure-monitor/logs/data-retention-configure?tabs=portal-3%2Cportal-1%2Cportal-2"
diff --git a/docs/archetypes/azure-resource-type/recommendations.yaml b/docs/archetypes/azure-resource-type/recommendations.yaml
index 03c3d0dd4..59349b2b2 100644
--- a/docs/archetypes/azure-resource-type/recommendations.yaml
+++ b/docs/archetypes/azure-resource-type/recommendations.yaml
@@ -11,7 +11,7 @@
   potentialBenefits: Potential Benefits of Implementing the Recommendation (less than 60 characters)
   pgVerified: false
   automationAvailable: false
-  tags: null/AI/AVD/AVS/HPC/SAP
+  tags: [AI-GTP-RAG, AVD, AVS, HPC, SAP]
   learnMoreLink:
     - name: Learn More
       url: "Link URL"
@@ -29,7 +29,7 @@
   potentialBenefits: Potential Benefits of Implementing the Recommendation (less than 60 characters)
   pgVerified: false
   automationAvailable: false
-  tags: null/AI/AVD/AVS/HPC/SAP
+  tags: [AI-GTP-RAG, AVD, AVS, HPC, SAP]
   learnMoreLink:
     - name: Learn More
       url: "Link URL"
diff --git a/docs/archetypes/azure-specialized-workload/recommendations.yaml b/docs/archetypes/azure-specialized-workload/recommendations.yaml
index 03c3d0dd4..59349b2b2 100644
--- a/docs/archetypes/azure-specialized-workload/recommendations.yaml
+++ b/docs/archetypes/azure-specialized-workload/recommendations.yaml
@@ -11,7 +11,7 @@
   potentialBenefits: Potential Benefits of Implementing the Recommendation (less than 60 characters)
   pgVerified: false
   automationAvailable: false
-  tags: null/AI/AVD/AVS/HPC/SAP
+  tags: [AI-GTP-RAG, AVD, AVS, HPC, SAP]
   learnMoreLink:
     - name: Learn More
       url: "Link URL"
@@ -29,7 +29,7 @@
   potentialBenefits: Potential Benefits of Implementing the Recommendation (less than 60 characters)
   pgVerified: false
   automationAvailable: false
-  tags: null/AI/AVD/AVS/HPC/SAP
+  tags: [AI-GTP-RAG, AVD, AVS, HPC, SAP]
   learnMoreLink:
     - name: Learn More
       url: "Link URL"
diff --git a/docs/archetypes/azure-waf/recommendations.yaml b/docs/archetypes/azure-waf/recommendations.yaml
index 27f949c85..c3731b861 100644
--- a/docs/archetypes/azure-waf/recommendations.yaml
+++ b/docs/archetypes/azure-waf/recommendations.yaml
@@ -11,7 +11,7 @@
   potentialBenefits: Potential Benefits of Implementing the Recommendation (less than 60 characters)
   pgVerified: false
   automationAvailable: false
-  tags: null
+  tags: [AI-GTP-RAG, AVD, AVS, HPC, SAP]
   learnMoreLink:
     - name: Learn More
       url: "Link URL"
@@ -29,7 +29,7 @@
   potentialBenefits: Potential Benefits of Implementing the Recommendation (less than 60 characters)
   pgVerified: false
   automationAvailable: false
-  tags: null
+  tags: [AI-GTP-RAG, AVD, AVS, HPC, SAP]
   learnMoreLink:
     - name: Learn More
       url: "Link URL"
diff --git a/docs/content/contributing/create-content/create-recommendations/_index.md b/docs/content/contributing/create-content/create-recommendations/_index.md
index c6feb947b..3b2c5b711 100644
--- a/docs/content/contributing/create-content/create-recommendations/_index.md
+++ b/docs/content/contributing/create-content/create-recommendations/_index.md
@@ -77,7 +77,7 @@ The YAML structure for adding new recommendations consists of several key-value
 | potentialBenefits | Enhanced data redundancy and boosts availability | String | The length should be less than 60 characters | The potential benefits of implementing the recommendation |
 | pgVerified | false | Boolean | true, false | Indicates whether the recommendation is verified by the relevant product group |
 | automationAvailable | false| Boolean | true, false | Indicates whether automation is available for validating the recommendation |
-| tags | null | String | null, AI, AVD, AVS, HPC, SAP | Indicates which type of specialized workload the recommendation is associated to. |
+| tags | [AVD]| String | [AI-GTP-RAG, AVD, AVS, HPC, SAP] | Indicates which type of specialized workload the recommendation is associated to. |
 | learnMoreLink | - name: Learn More url: "<https://learn.microsoft.com/en-us/azure/reliability/reliability-batch#cross-region-disaster-recovery-and-business-continuity>" | Object | Only 1 link per recommendation | Links related to the recommendation, such as announcements or documentation |
 
 ### Recommendation Categories