diff --git a/.github/workflows/label-feature.yml b/.github/workflows/label-feature.yml
index 96ac8c1..d13cf87 100644
--- a/.github/workflows/label-feature.yml
+++ b/.github/workflows/label-feature.yml
@@ -5,6 +5,8 @@ on:
 
 jobs:
   build:
+    permissions:
+      issues: write
     runs-on: ubuntu-latest
     steps:
     - name: Close Issue
diff --git a/.github/workflows/label-support.yml b/.github/workflows/label-support.yml
index c6f2aa4..ea0f240 100644
--- a/.github/workflows/label-support.yml
+++ b/.github/workflows/label-support.yml
@@ -5,6 +5,8 @@ on:
 
 jobs:
   build:
+    permissions:
+      issues: write
     runs-on: ubuntu-latest
     steps:
     - name: Close Issue
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index c116b93..217078a 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -7,6 +7,9 @@ on:
 jobs:
   stale:
 
+    permissions:
+      issues: write
+      pull-requests: write
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/sync_ghes.yaml b/.github/workflows/sync_ghes.yaml
index a3c298a..946218f 100644
--- a/.github/workflows/sync_ghes.yaml
+++ b/.github/workflows/sync_ghes.yaml
@@ -7,6 +7,8 @@ on:
 
 jobs:
   sync:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/validate-data.yaml b/.github/workflows/validate-data.yaml
index 745bc25..7d5c1ee 100644
--- a/.github/workflows/validate-data.yaml
+++ b/.github/workflows/validate-data.yaml
@@ -6,6 +6,8 @@ on:
 
 jobs:
   validate-data:
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/README.md b/README.md
index 2c2f1b5..4b5b9f8 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ These are the workflow files for helping people get started with GitHub Actions.
 
 ### Directory structure
 
-* [ci](ci): solutions for Continuous Integration
+* [ci](ci): solutions for Continuous Integration and Deployments
 * [automation](automation): solutions for automating workflows.
 * [code-scanning](code-scanning): starter workflows for [Code Scanning](https://github.com/features/security)
 * [icons](icons): svg icons for the relevant template
@@ -23,10 +23,22 @@ For example: `ci/django.yml` and `ci/properties/django.properties.json`.
 
 ### Valid properties
 
-* `name`: the name shown in onboarding
+* `name`: the name shown in onboarding. This property is unique within the repository.
 * `description`: the description shown in onboarding
-* `iconName`: the icon name in the relevant folder, for example `django` should have an icon `icons/django.svg`. Only SVG is supported at this time
-* `categories`: the categories that it will be shown under
+* `iconName`: the icon name in the relevant folder, for example, `django` should have an icon `icons/django.svg`. Only SVG is supported at this time. Another option is to use [octicon](https://primer.style/octicons/). The format to use an octicon is `octicon <<icon name>>`. Example: `octicon person`
+* `creator`: creator of the template shown in onboarding. All the workflow templates from an author will have the same `creator` field.
+* `categories`: the categories that it will be shown under. Choose at least one category from the list [here](#categories). Further, choose the categories from the list of languages available [here](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml). When a user views the available templates, those templates that match the same language will feature more prominently.
+
+### Categories
+* continuous-integration
+* deployment
+* testing
+* code-quality
+* code-review
+* dependency-management
+* monitoring
+* Automation
+* utilities
 
 ### Variables
 These variables can be placed in the starter workflow and will be substituted as detailed below:
diff --git a/automation/stale.yml b/automation/stale.yml
index 277380b..ff88dc0 100644
--- a/automation/stale.yml
+++ b/automation/stale.yml
@@ -1,3 +1,8 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
 name: Mark stale issues and pull requests
 
 on:
diff --git a/ci/android.yml b/ci/android.yml
index 4bbc689..3037b9f 100644
--- a/ci/android.yml
+++ b/ci/android.yml
@@ -18,6 +18,7 @@ jobs:
       with:
         java-version: '11'
         distribution: 'adopt'
+        cache: gradle
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
diff --git a/ci/dotnet-desktop.yml b/ci/dotnet-desktop.yml
index 2e55b15..0635779 100644
--- a/ci/dotnet-desktop.yml
+++ b/ci/dotnet-desktop.yml
@@ -107,7 +107,7 @@ jobs:
     - name: Remove the pfx
       run: Remove-Item -path $env:Wap_Project_Directory\$env:Signing_Certificate
 
-    # Upload the MSIX package: https://github.com/marketplace/actions/upload-artifact
+    # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact
     - name: Upload build artifacts
       uses: actions/upload-artifact@v2
       with:
diff --git a/ci/go.yml b/ci/go.yml
index 22a110a..afff652 100644
--- a/ci/go.yml
+++ b/ci/go.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
 
     - name: Build
       run: go build -v ./...
diff --git a/ci/gradle.yml b/ci/gradle.yml
index 6e7e922..5ecabba 100644
--- a/ci/gradle.yml
+++ b/ci/gradle.yml
@@ -1,4 +1,4 @@
-# This workflow will build a Java project with Gradle
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Java CI with Gradle
@@ -21,6 +21,7 @@ jobs:
       with:
         java-version: '11'
         distribution: 'adopt'
+        cache: gradle
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
diff --git a/ci/maven.yml b/ci/maven.yml
index 923425b..ac3b6de 100644
--- a/ci/maven.yml
+++ b/ci/maven.yml
@@ -1,4 +1,4 @@
-# This workflow will build a Java project with Maven
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
 name: Java CI with Maven
@@ -21,5 +21,6 @@ jobs:
       with:
         java-version: '11'
         distribution: 'adopt'
+        cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/ci/properties/gem-push.properties.json b/ci/properties/gem-push.properties.json
index c54e7b5..188d80a 100644
--- a/ci/properties/gem-push.properties.json
+++ b/ci/properties/gem-push.properties.json
@@ -2,5 +2,5 @@
     "name": "Ruby Gem",
     "description": "Pushes a Ruby Gem to RubyGems and GitHub Package Registry.",
     "iconName": "ruby-gems",
-    "categories": ["Ruby", "SDLC"]
+    "categories": ["Ruby"]
 }
diff --git a/ci/properties/gradle-publish.properties.json b/ci/properties/gradle-publish.properties.json
index 90b7295..3ec3f4f 100644
--- a/ci/properties/gradle-publish.properties.json
+++ b/ci/properties/gradle-publish.properties.json
@@ -2,5 +2,5 @@
     "name": "Publish Java Package with Gradle",
     "description": "Build a Java Package using Gradle and publish to GitHub Packages.",
     "iconName": "gradle",
-    "categories": ["Java", "Gradle"]
+    "categories": ["Java", "Gradle", "Spring", "JSF"]
 }
\ No newline at end of file
diff --git a/ci/properties/gradle.properties.json b/ci/properties/gradle.properties.json
index bfe1a6f..c90f78f 100644
--- a/ci/properties/gradle.properties.json
+++ b/ci/properties/gradle.properties.json
@@ -2,5 +2,5 @@
     "name": "Java with Gradle",
     "description": "Build and test a Java project using a Gradle wrapper script.",
     "iconName": "gradle",
-    "categories": ["Java", "Gradle"]
+    "categories": ["Java", "Gradle", "Spring", "JSF"]
 }
diff --git a/ci/properties/maven-publish.properties.json b/ci/properties/maven-publish.properties.json
index 2f59f41..41f2915 100644
--- a/ci/properties/maven-publish.properties.json
+++ b/ci/properties/maven-publish.properties.json
@@ -2,5 +2,5 @@
     "name": "Publish Java Package with Maven",
     "description": "Build a Java Package using Maven and publish to GitHub Packages.",
     "iconName": "maven",
-    "categories": ["Java", "Maven"]
+    "categories": ["Java", "Maven", "Spring", "JSF"]
 }
\ No newline at end of file
diff --git a/ci/properties/maven.properties.json b/ci/properties/maven.properties.json
index e322d04..4086470 100644
--- a/ci/properties/maven.properties.json
+++ b/ci/properties/maven.properties.json
@@ -2,5 +2,5 @@
     "name": "Java with Maven",
     "description": "Build and test a Java project with Apache Maven.",
     "iconName": "maven",
-    "categories": ["Java", "Maven"]
+    "categories": ["Java", "Maven", "Spring", "JSF"]
 }
diff --git a/ci/properties/node.js.properties.json b/ci/properties/node.js.properties.json
index 6ab4c53..c982d17 100644
--- a/ci/properties/node.js.properties.json
+++ b/ci/properties/node.js.properties.json
@@ -2,5 +2,5 @@
     "name": "Node.js",
     "description": "Build and test a Node.js project with npm.",
     "iconName": "nodejs",
-    "categories": ["JavaScript", "Node", "Npm"]
+    "categories": ["JavaScript", "npm", "React", "Angular"]
 }
diff --git a/ci/properties/npm-publish.properties.json b/ci/properties/npm-publish.properties.json
index d253373..764dbf3 100644
--- a/ci/properties/npm-publish.properties.json
+++ b/ci/properties/npm-publish.properties.json
@@ -2,5 +2,5 @@
     "name": "Publish Node.js Package",
     "description": "Publishes a Node.js package to npm and GitHub Packages.",
     "iconName": "node-package-transparent",
-    "categories": ["JavaScript", "SDLC"]
+    "categories": ["JavaScript", "npm"]
 }
diff --git a/ci/properties/rails-lint.properties.json b/ci/properties/rails-lint.properties.json
new file mode 100644
index 0000000..7a109a1
--- /dev/null
+++ b/ci/properties/rails-lint.properties.json
@@ -0,0 +1,6 @@
+{
+    "name": "Rails - Build and Run Linters",
+    "description": "Build Rails application and run linters",
+    "iconName": "ruby",
+    "categories": ["Ruby", "Rails"]
+}
diff --git a/ci/r.yml b/ci/r.yml
index efc6587..f257fbd 100644
--- a/ci/r.yml
+++ b/ci/r.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-latest
+    runs-on: macos-latest
     strategy:
       matrix:
         r-version: [3.5, 3.6]
diff --git a/ci/rails-lint.yml b/ci/rails-lint.yml
new file mode 100644
index 0000000..b2f8832
--- /dev/null
+++ b/ci/rails-lint.yml
@@ -0,0 +1,32 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies, and  run linters
+name: Build Rails and run linters
+
+on:
+  push:
+    branches: [ $default-branch ]
+  pull_request:
+    branches: [ $default-branch ]
+jobs:
+  run-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby and install gems
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      # Add or Replace any other security checks here
+      - name: Run security checks
+        run: |
+          bin/bundler-audit --update
+          bin/brakeman -q -w2
+      # Add or Replace any other Linters here
+      - name: Run linters
+        run: |
+          bin/rubocop --parallel
\ No newline at end of file
diff --git a/code-scanning/properties/devskim.properties.json b/code-scanning/properties/devskim.properties.json
index 0eab5c6..40fd52b 100644
--- a/code-scanning/properties/devskim.properties.json
+++ b/code-scanning/properties/devskim.properties.json
@@ -1,7 +1,7 @@
 {
     "name": "DevSkim",
     "creator": "Microsoft CST-E",
-    "description": "DevSkim is security linter that highlights common security issues in source code.",
+    "description": "DevSkim is a security linter that highlights common security issues in source code.",
     "iconName": "cst-logo",
     "categories": ["Code Scanning", "C", "C#", "C++", "Go", "Java", "JavaScript", "TypeScript", "Python", "Powershell", "Cobol", "Objective C", "PHP", "Ruby", "Rust", "SQL", "Swift", "Visual Basic"]
 }
diff --git a/ci/alibabacloud.yml b/deployments/alibabacloud.yml
similarity index 100%
rename from ci/alibabacloud.yml
rename to deployments/alibabacloud.yml
diff --git a/ci/aws.yml b/deployments/aws.yml
similarity index 100%
rename from ci/aws.yml
rename to deployments/aws.yml
diff --git a/ci/azure.yml b/deployments/azure.yml
similarity index 100%
rename from ci/azure.yml
rename to deployments/azure.yml
diff --git a/ci/google.yml b/deployments/google.yml
similarity index 100%
rename from ci/google.yml
rename to deployments/google.yml
diff --git a/ci/ibm.yml b/deployments/ibm.yml
similarity index 100%
rename from ci/ibm.yml
rename to deployments/ibm.yml
diff --git a/ci/openshift.yml b/deployments/openshift.yml
similarity index 100%
rename from ci/openshift.yml
rename to deployments/openshift.yml
diff --git a/ci/properties/alibabacloud.properties.json b/deployments/properties/alibabacloud.properties.json
similarity index 86%
rename from ci/properties/alibabacloud.properties.json
rename to deployments/properties/alibabacloud.properties.json
index bbee6df..1ce285f 100644
--- a/ci/properties/alibabacloud.properties.json
+++ b/deployments/properties/alibabacloud.properties.json
@@ -3,5 +3,5 @@
     "description": "Deploy a container to Alibaba Cloud Container Service for Kubernetes (ACK).",
     "creator": "Alibaba Cloud",
     "iconName": "alibabacloud",
-    "categories": null
+    "categories": ["Deployment"]
 }
diff --git a/ci/properties/aws.properties.json b/deployments/properties/aws.properties.json
similarity index 86%
rename from ci/properties/aws.properties.json
rename to deployments/properties/aws.properties.json
index b80775f..10a7ed3 100644
--- a/ci/properties/aws.properties.json
+++ b/deployments/properties/aws.properties.json
@@ -3,5 +3,5 @@
     "description": "Deploy a container to an Amazon ECS service powered by AWS Fargate or Amazon EC2.",
     "creator": "Amazon Web Services",
     "iconName": "aws",
-    "categories": null
+    "categories": ["Deployment"]
 }
\ No newline at end of file
diff --git a/ci/properties/azure.properties.json b/deployments/properties/azure.properties.json
similarity index 85%
rename from ci/properties/azure.properties.json
rename to deployments/properties/azure.properties.json
index fd9d0d8..362d5d1 100644
--- a/ci/properties/azure.properties.json
+++ b/deployments/properties/azure.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a Node.js project and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": null
+    "categories": ["Deployment"]
 }
\ No newline at end of file
diff --git a/ci/properties/google.properties.json b/deployments/properties/google.properties.json
similarity index 86%
rename from ci/properties/google.properties.json
rename to deployments/properties/google.properties.json
index e2d917d..c7f216f 100644
--- a/ci/properties/google.properties.json
+++ b/deployments/properties/google.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a docker container, publish it to Google Container Registry, and deploy to GKE.",
     "creator": "Google Cloud",
     "iconName": "googlegke",
-    "categories": null
+    "categories": ["Deployment"]
 }
\ No newline at end of file
diff --git a/ci/properties/ibm.properties.json b/deployments/properties/ibm.properties.json
similarity index 87%
rename from ci/properties/ibm.properties.json
rename to deployments/properties/ibm.properties.json
index cfd0383..4219690 100644
--- a/ci/properties/ibm.properties.json
+++ b/deployments/properties/ibm.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a docker container, publish it to IBM Cloud Container Registry, and deploy to IBM Cloud Kubernetes Service.",
     "creator": "IBM",
     "iconName": "ibm",
-    "categories": null
+    "categories": ["Deployment"]
 }
\ No newline at end of file
diff --git a/ci/properties/openshift.properties.json b/deployments/properties/openshift.properties.json
similarity index 77%
rename from ci/properties/openshift.properties.json
rename to deployments/properties/openshift.properties.json
index 53538c7..54948c2 100644
--- a/ci/properties/openshift.properties.json
+++ b/deployments/properties/openshift.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a Docker-based project and deploy it to OpenShift.",
     "creator": "Red Hat",
     "iconName": "openshift",
-    "categories": [ "Dockerfile" ]
+    "categories": ["Dockerfile","Deployment" ]
 }
diff --git a/ci/properties/tencent.properties.json b/deployments/properties/tencent.properties.json
similarity index 87%
rename from ci/properties/tencent.properties.json
rename to deployments/properties/tencent.properties.json
index ba579a1..32d0da7 100644
--- a/ci/properties/tencent.properties.json
+++ b/deployments/properties/tencent.properties.json
@@ -3,5 +3,5 @@
     "description": "This workflow will build a docker container, publish and deploy it to Tencent Kubernetes Engine (TKE).",
     "creator": "Tencent Cloud",
     "iconName": "tencentcloud",
-    "categories": null
+    "categories": ["Deployment"]
 }
\ No newline at end of file
diff --git a/ci/properties/terraform.properties.json b/deployments/properties/terraform.properties.json
similarity index 83%
rename from ci/properties/terraform.properties.json
rename to deployments/properties/terraform.properties.json
index bfeabdf..12afabe 100644
--- a/ci/properties/terraform.properties.json
+++ b/deployments/properties/terraform.properties.json
@@ -3,5 +3,5 @@
     "description": "Set up Terraform CLI in your GitHub Actions workflow.",
     "creator": "HashiCorp",
     "iconName": "terraform",
-    "categories": null
+    "categories": ["Deployment"]
 }
diff --git a/ci/tencent.yml b/deployments/tencent.yml
similarity index 100%
rename from ci/tencent.yml
rename to deployments/tencent.yml
diff --git a/ci/terraform.yml b/deployments/terraform.yml
similarity index 100%
rename from ci/terraform.yml
rename to deployments/terraform.yml
diff --git a/script/sync-ghes/index.ts b/script/sync-ghes/index.ts
index 0fa3440..9edc70e 100755
--- a/script/sync-ghes/index.ts
+++ b/script/sync-ghes/index.ts
@@ -19,6 +19,8 @@ interface WorkflowProperties {
   iconName?: string;
 
   categories: string[] | null;
+
+  creator?: string;
 }
 
 interface WorkflowsCheckResult {
@@ -28,12 +30,14 @@ interface WorkflowsCheckResult {
 
 async function checkWorkflows(
   folders: string[],
-  enabledActions: string[]
+  enabledActions: string[],
+  partners: string[]
 ): Promise<WorkflowsCheckResult> {
   const result: WorkflowsCheckResult = {
     compatibleWorkflows: [],
     incompatibleWorkflows: [],
   };
+  const partnersSet = new Set(partners.map((x) => x.toLowerCase()));
 
   for (const folder of folders) {
     const dir = await fs.readdir(folder, {
@@ -41,7 +45,7 @@ async function checkWorkflows(
     });
 
     for (const e of dir) {
-      if (e.isFile()) {
+      if (e.isFile() && extname(e.name) === ".yml") {
         const workflowFilePath = join(folder, e.name);
         const workflowId = basename(e.name, extname(e.name));
         const workflowProperties: WorkflowProperties = require(join(
@@ -51,11 +55,10 @@ async function checkWorkflows(
         ));
         const iconName: string | undefined = workflowProperties["iconName"];
 
-        const isBlankTemplate = workflowId === "blank";
-        const partnerWorkflow = workflowProperties.categories === null;
+        const isPartnerWorkflow = workflowProperties.creator ? partnersSet.has(workflowProperties.creator.toLowerCase()) : false;
 
         const enabled =
-          (isBlankTemplate || !partnerWorkflow) &&
+          !isPartnerWorkflow &&
           (await checkWorkflow(workflowFilePath, enabledActions));
 
         const workflowDesc: WorkflowDesc = {
@@ -90,7 +93,6 @@ async function checkWorkflow(
 ): Promise<boolean> {
   // Create set with lowercase action names for easier, case-insensitive lookup
   const enabledActionsSet = new Set(enabledActions.map((x) => x.toLowerCase()));
-
   try {
     const workflowFileContent = await fs.readFile(workflowPath, "utf8");
     const workflow = safeLoad(workflowFileContent);
@@ -102,7 +104,8 @@ async function checkWorkflow(
         if (!!step.uses) {
           // Check if allowed action
           const [actionName, _] = step.uses.split("@");
-          if (!enabledActionsSet.has(actionName.toLowerCase())) {
+          const actionNwo = actionName.split("/").slice(0, 2).join("/");
+          if (!enabledActionsSet.has(actionNwo.toLowerCase())) {
             console.info(
               `Workflow ${workflowPath} uses '${actionName}' which is not supported for GHES.`
             );
@@ -126,7 +129,8 @@ async function checkWorkflow(
 
     const result = await checkWorkflows(
       settings.folders,
-      settings.enabledActions
+      settings.enabledActions,
+      settings.partners
     );
 
     console.group(
diff --git a/script/sync-ghes/settings.json b/script/sync-ghes/settings.json
index 050ea0a..e4f50fa 100644
--- a/script/sync-ghes/settings.json
+++ b/script/sync-ghes/settings.json
@@ -1,7 +1,9 @@
 {
   "folders": [
     "../../ci",
-    "../../automation"
+    "../../automation",
+    "../../deployments",
+    "../../code-scanning"
   ],
   "enabledActions": [
     "actions/checkout",
@@ -15,6 +17,17 @@
     "actions/stale",
     "actions/starter-workflows",
     "actions/upload-artifact",
-    "actions/upload-release-asset"
+    "actions/upload-release-asset",
+    "github/codeql-action"
+  ],
+  "partners": [
+    "Alibaba Cloud",
+    "Amazon Web Services",
+    "Microsoft Azure",
+    "Google Cloud",
+    "IBM",
+    "Red Hat",
+    "Tencent Cloud",
+    "HashiCorp"
   ]
 }
diff --git a/script/validate-data/index.ts b/script/validate-data/index.ts
index 81048f8..8413653 100755
--- a/script/validate-data/index.ts
+++ b/script/validate-data/index.ts
@@ -7,6 +7,7 @@ import { endGroup, error, info, setFailed, startGroup } from '@actions/core';
 
 interface WorkflowWithErrors {
   id: string;
+  name: string;
   errors: string[];
 }
 
@@ -20,7 +21,7 @@ interface WorkflowProperties {
 const propertiesSchema = {
   type: "object",
   properties: {
-    name: { type: "string", required: true },
+    name: { type: "string", required: true , "minLength": 1},
     description: { type: "string", required: true },
     creator: { type: "string", required: false },
     iconName: { type: "string", required: true },
@@ -41,7 +42,7 @@ const propertiesSchema = {
 
 async function checkWorkflows(folders: string[]): Promise<WorkflowWithErrors[]> {
   const result: WorkflowWithErrors[] = []
-
+  const workflow_template_names = new Set()
   for (const folder of folders) {
     const dir = await fs.readdir(folder, {
       withFileTypes: true,
@@ -54,9 +55,12 @@ async function checkWorkflows(folders: string[]): Promise<WorkflowWithErrors[]>
         const workflowFilePath = join(folder, e.name);
         const propertiesFilePath = join(folder, "properties", `${fileType}.properties.json`)
 
-        const errors = await checkWorkflow(workflowFilePath, propertiesFilePath);
-        if (errors.errors.length > 0) {
-          result.push(errors)
+        const workflowWithErrors = await checkWorkflow(workflowFilePath, propertiesFilePath);
+        if(workflowWithErrors.name && workflow_template_names.size == workflow_template_names.add(workflowWithErrors.name).size) {
+          workflowWithErrors.errors.push(`Workflow template name "${workflowWithErrors.name}" already exists`) 
+        }
+        if (workflowWithErrors.errors.length > 0) {
+          result.push(workflowWithErrors)
         }
       }
     }
@@ -68,6 +72,7 @@ async function checkWorkflows(folders: string[]): Promise<WorkflowWithErrors[]>
 async function checkWorkflow(workflowPath: string, propertiesPath: string): Promise<WorkflowWithErrors> {
   let workflowErrors: WorkflowWithErrors = {
     id: workflowPath,
+    name: null,
     errors: []
   }
 
@@ -77,17 +82,28 @@ async function checkWorkflow(workflowPath: string, propertiesPath: string): Prom
 
     const propertiesFileContent = await fs.readFile(propertiesPath, "utf8")
     const properties: WorkflowProperties = JSON.parse(propertiesFileContent)
-
+    if(properties.name && properties.name.trim().length > 0) {
+      workflowErrors.name = properties.name
+    }
     let v = new validator();
     const res = v.validate(properties, propertiesSchema)
     workflowErrors.errors = res.errors.map(e => e.toString())
-
-    if (properties.iconName && !properties.iconName.startsWith("octicon")) {
-      try {
-        await fs.access(`../../icons/${properties.iconName}.svg`)
-      } catch (e) {
-        workflowErrors.errors.push(`No icon named ${properties.iconName} found`)
+    
+    if (properties.iconName) {
+      if(! /^octicon\s+/.test(properties.iconName)) {
+        try {
+          await fs.access(`../../icons/${properties.iconName}.svg`)
+        } catch (e) {
+          workflowErrors.errors.push(`No icon named ${properties.iconName} found`)
+        }
       }
+      else {
+        let iconName = properties.iconName.match(/^octicon\s+(.*)/)
+        if(!iconName || iconName[1].split(".")[0].length <= 0) {
+          workflowErrors.errors.push(`No icon named ${properties.iconName} found`)
+        }
+      }
+      
     }
   } catch (e) {
     workflowErrors.errors.push(e.toString())
diff --git a/script/validate-data/settings.json b/script/validate-data/settings.json
index 1913e2f..f7c08cf 100644
--- a/script/validate-data/settings.json
+++ b/script/validate-data/settings.json
@@ -1,6 +1,7 @@
 {
   "folders": [
     "../../ci",
-    "../../automation"
+    "../../automation",
+    "../../deployments"
   ]
 }
\ No newline at end of file