From 3a624e595bc9d48812b1379ca4946acfedec302b Mon Sep 17 00:00:00 2001
From: Natale Vinto <nvinto@redhat.com>
Date: Fri, 30 Aug 2024 08:50:00 +0200
Subject: [PATCH 1/4] Remove Rekor Public Key

---
 .../external-secret-rekor-public-key.yaml        | 16 ----------------
 .../external-secret-rekor-public-key.yaml        | 16 ----------------
 .../external-secret-rekor-public-key.yaml        | 16 ----------------
 .../external-secret-rekor-public-key.yaml        | 16 ----------------
 4 files changed, 64 deletions(-)
 delete mode 100644 scaffolder-templates/gitlab/coolstore/catalog-spring-boot/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
 delete mode 100644 scaffolder-templates/gitlab/coolstore/gateway-vertx/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
 delete mode 100644 scaffolder-templates/gitlab/coolstore/inventory-quarkus/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
 delete mode 100644 scaffolder-templates/gitlab/coolstore/web-nodejs/manifests/helm/build/templates/external-secret-rekor-public-key.yaml

diff --git a/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/manifests/helm/build/templates/external-secret-rekor-public-key.yaml b/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
deleted file mode 100644
index 553dbb5..0000000
--- a/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: rekor-public-key
-spec:
-  refreshInterval: 10s
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: rekor-public-key
-  data:
-  - secretKey: public.key
-    remoteRef:
-      key: secrets/janusidp/rekor
-      property: public_key
diff --git a/scaffolder-templates/gitlab/coolstore/gateway-vertx/manifests/helm/build/templates/external-secret-rekor-public-key.yaml b/scaffolder-templates/gitlab/coolstore/gateway-vertx/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
deleted file mode 100644
index 553dbb5..0000000
--- a/scaffolder-templates/gitlab/coolstore/gateway-vertx/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: rekor-public-key
-spec:
-  refreshInterval: 10s
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: rekor-public-key
-  data:
-  - secretKey: public.key
-    remoteRef:
-      key: secrets/janusidp/rekor
-      property: public_key
diff --git a/scaffolder-templates/gitlab/coolstore/inventory-quarkus/manifests/helm/build/templates/external-secret-rekor-public-key.yaml b/scaffolder-templates/gitlab/coolstore/inventory-quarkus/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
deleted file mode 100644
index 553dbb5..0000000
--- a/scaffolder-templates/gitlab/coolstore/inventory-quarkus/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: rekor-public-key
-spec:
-  refreshInterval: 10s
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: rekor-public-key
-  data:
-  - secretKey: public.key
-    remoteRef:
-      key: secrets/janusidp/rekor
-      property: public_key
diff --git a/scaffolder-templates/gitlab/coolstore/web-nodejs/manifests/helm/build/templates/external-secret-rekor-public-key.yaml b/scaffolder-templates/gitlab/coolstore/web-nodejs/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
deleted file mode 100644
index 553dbb5..0000000
--- a/scaffolder-templates/gitlab/coolstore/web-nodejs/manifests/helm/build/templates/external-secret-rekor-public-key.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: rekor-public-key
-spec:
-  refreshInterval: 10s
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: rekor-public-key
-  data:
-  - secretKey: public.key
-    remoteRef:
-      key: secrets/janusidp/rekor
-      property: public_key

From 82b31391bd8243e31eea3dcb70cd39d2e983a8aa Mon Sep 17 00:00:00 2001
From: Natale Vinto <nvinto@redhat.com>
Date: Fri, 30 Aug 2024 14:36:03 +0200
Subject: [PATCH 2/4] Use jinja to populate hosts

---
 .../gitlab/coolstore/catalog-spring-boot/template.yaml      | 6 +++---
 .../gitlab/coolstore/gateway-vertx/template.yaml            | 6 +++---
 .../gitlab/coolstore/inventory-quarkus/template.yaml        | 6 +++---
 .../gitlab/coolstore/web-nodejs/template.yaml               | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml b/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml
index cb2aaf6..82d80ec 100644
--- a/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml
+++ b/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml
@@ -36,7 +36,7 @@ spec:
           title: Cluster Id
           type: string
           description: Id of the cluster
-          default: .apps.cluster-pp72k.sandbox1540.opentlc.com
+          default: {{ cluster_subdomain }}
         namespace:
           title: Namespace
           type: string
@@ -77,7 +77,7 @@ spec:
                   title: Image Host
                   type: string
                   description: Host for storing image
-                  default: quay-pp72k.apps.cluster-pp72k.sandbox1540.opentlc.com
+                  default: {{ quay_host }}
                 image_organization:
                   title: Organization
                   type: string
@@ -100,7 +100,7 @@ spec:
               title: Repo Host
               type: string
               description: Your SCM host
-              default: gitlab-gitlab.apps.cluster-pp72k.sandbox1540.opentlc.com
+              default: {{ gitlab_host }}
             owner:
               title: Repo Owner
               type: string
diff --git a/scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml b/scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml
index 8b6dd52..f9e6f3b 100644
--- a/scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml
+++ b/scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml
@@ -36,7 +36,7 @@ spec:
           title: Cluster Id
           type: string
           description: Id of the cluster
-          default: .apps.cluster-pp72k.sandbox1540.opentlc.com
+          default: {{ cluster_subdomain }}
         namespace:
           title: Namespace
           type: string
@@ -77,7 +77,7 @@ spec:
                   title: Image Host
                   type: string
                   description: Host for storing image
-                  default: quay-pp72k.apps.cluster-pp72k.sandbox1540.opentlc.com
+                  default: {{ quay_host }}
                 image_organization:
                   title: Organization
                   type: string
@@ -100,7 +100,7 @@ spec:
               title: Repo Host
               type: string
               description: Your SCM host
-              default: gitlab-gitlab.apps.cluster-pp72k.sandbox1540.opentlc.com
+              default: {{ gitlab_host }}
             owner:
               title: Repo Owner
               type: string
diff --git a/scaffolder-templates/gitlab/coolstore/inventory-quarkus/template.yaml b/scaffolder-templates/gitlab/coolstore/inventory-quarkus/template.yaml
index a595f17..c6aa1d8 100644
--- a/scaffolder-templates/gitlab/coolstore/inventory-quarkus/template.yaml
+++ b/scaffolder-templates/gitlab/coolstore/inventory-quarkus/template.yaml
@@ -36,7 +36,7 @@ spec:
           title: Cluster Id
           type: string
           description: Id of the cluster
-          default: .apps.cluster-pp72k.sandbox1540.opentlc.com
+          default: {{ cluster_subdomain }}
         namespace:
           title: Namespace
           type: string
@@ -77,7 +77,7 @@ spec:
                   title: Image Host
                   type: string
                   description: Host for storing image
-                  default: quay-pp72k.apps.cluster-pp72k.sandbox1540.opentlc.com
+                  default: {{ quay_host }}
                 image_organization:
                   title: Organization
                   type: string
@@ -100,7 +100,7 @@ spec:
               title: Repo Host
               type: string
               description: Your SCM host
-              default: gitlab-gitlab.apps.cluster-pp72k.sandbox1540.opentlc.com
+              default: {{ gitlab_host }}
             owner:
               title: Repo Owner
               type: string
diff --git a/scaffolder-templates/gitlab/coolstore/web-nodejs/template.yaml b/scaffolder-templates/gitlab/coolstore/web-nodejs/template.yaml
index 3155a87..f588047 100644
--- a/scaffolder-templates/gitlab/coolstore/web-nodejs/template.yaml
+++ b/scaffolder-templates/gitlab/coolstore/web-nodejs/template.yaml
@@ -35,7 +35,7 @@ spec:
           title: Cluster Id
           type: string
           description: Id of the cluster
-          default: .apps.cluster-pp72k.sandbox1540.opentlc.com
+          default: {{ cluster_subdomain }}
         namespace:
           title: Namespace
           type: string
@@ -76,7 +76,7 @@ spec:
                   title: Image Host
                   type: string
                   description: Host for storing image
-                  default: quay-pp72k.apps.cluster-pp72k.sandbox1540.opentlc.com
+                  default: {{ quay_host }}
                 image_organization:
                   title: Organization
                   type: string
@@ -99,7 +99,7 @@ spec:
               title: Repo Host
               type: string
               description: Your SCM host
-              default: gitlab-gitlab.apps.cluster-pp72k.sandbox1540.opentlc.com
+              default: {{ gitlab_host }}
             owner:
               title: Repo Owner
               type: string

From 172be554d58e31afc61ab1187117ba7cc3fb7c20 Mon Sep 17 00:00:00 2001
From: treddy08 <94612779+treddy08@users.noreply.github.com>
Date: Sun, 1 Sep 2024 16:54:32 +1000
Subject: [PATCH 3/4] Update showcase-templates.yaml

---
 showcase-templates.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/showcase-templates.yaml b/showcase-templates.yaml
index 6ca9ee5..d3b4197 100644
--- a/showcase-templates.yaml
+++ b/showcase-templates.yaml
@@ -1,9 +1,13 @@
 apiVersion: backstage.io/v1alpha1
 kind: Location
 metadata:
-  name: wind-turbine-templates
-  description: A collection of Backstage templates for Janus-IDP Backstage
+  name: redhat-developer-templates
+  description: A collection of Red Hat Developer Software Templates
 spec:
   type: url
   targets:
-     - https://{{ gitlab_host }}/{{ gitlab_group }}/wind-turbine-templates/blob/master/scaffolder-templates/gitlab/quinoa-wind-turbine/template.yaml
+    - scaffolder-templates/gitlab/quinoa-wind-turbine/template.yaml
+    - scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml
+    - scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml
+    - scaffolder-templates/gitlab/coolstore/inventory-quarkus/template.yaml
+    - scaffolder-templates/gitlab/coolstore/web-nodejs/template.yaml

From 2ca0e56ee983179cd5eb43849101cd27d5c4b585 Mon Sep 17 00:00:00 2001
From: treddy08 <treddy@redhat.com>
Date: Sun, 1 Sep 2024 19:05:55 +1000
Subject: [PATCH 4/4] update

---
 .../catalog-spring-boot/template.yaml         | 70 +++++++++----------
 .../coolstore/gateway-vertx/template.yaml     | 70 +++++++++----------
 .../coolstore/inventory-quarkus/template.yaml | 70 +++++++++----------
 .../gitlab/coolstore/web-nodejs/template.yaml | 70 +++++++++----------
 4 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml b/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml
index 82d80ec..df977c2 100644
--- a/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml
+++ b/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/template.yaml
@@ -126,30 +126,30 @@ spec:
         copyWithoutTemplating:
           - .github/workflows/*
         values:
-          component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          description: ${{ parameters.description }}
-          namespace_raw: ${{ parameters.namespace }}
-          namespace: ${{ parameters.namespace }}-dev
-          owner: ${{ user.entity.metadata.name }}
-          cluster: ${{ parameters.cluster_id }}
-          host: ${{ parameters.repo.host }}
-          destination: ${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}
-          quay_destination: ${{ parameters.image_organization}}/${{ parameters.namespace }}-${{ parameters.application_id }}
+          component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          description: {{ '${{ parameters.description }}' }}
+          namespace_raw: {{ '${{ parameters.namespace }}' }}
+          namespace: {{ '${{ parameters.namespace }}' }}-dev
+          owner: {{ '${{ user.entity.metadata.name }}' }}
+          cluster: {{ '${{ parameters.cluster_id }}' }}
+          host: {{ '${{ parameters.repo.host }}' }}
+          destination: {{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          quay_destination: {{ '${{ parameters.image_organization}}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
           port: 8080
-          verify_commits: ${{ parameters.repo.verify_commits }}
+          verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
 
     - id: publish
       name: Publish
       action: publish:gitlab
       input:
-        repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}"
+        repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}"
         repoVisibility: public
 
     - id: register
       name: Register
       action: catalog:register
       input:
-        repoContentsUrl: ${{ steps.publish.output.repoContentsUrl }}
+        repoContentsUrl: {{ '${{ steps.publish.output.repoContentsUrl }}' }}
         catalogInfoPath: "/catalog-info.yaml"
 
     - id: template-gitops-deployment
@@ -159,33 +159,33 @@ spec:
         url: ./manifests
         copyWithoutTemplating: []
         values:
-          component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          description: ${{ parameters.description }}
-          destination: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
-          source_repository: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}.git
-          repository_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          git_owner: ${{ parameters.repo.owner }}
-          cluster: ${{ parameters.cluster_id }}
-          namespace: ${{ parameters.namespace }}
-          image_registry: ${{ parameters.image_registry }}
-          image_host: ${{ parameters.image_host }}
-          image_organization: ${{ parameters.image_organization }}
-          image_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          image_tag: ${{ parameters.image_tag }}
+          component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          description: {{ '${{ parameters.description }}' }}
+          destination: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
+          source_repository: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}.git
+          repository_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          git_owner: {{ '${{ parameters.repo.owner }}' }}
+          cluster: {{ '${{ parameters.cluster_id }}' }}
+          namespace: {{ '${{ parameters.namespace }}' }}
+          image_registry: {{ '${{ parameters.image_registry }}' }}
+          image_host: {{ '${{ parameters.image_host }}' }}
+          image_organization: {{ '${{ parameters.image_organization }}' }}
+          image_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          image_tag: {{ '${{ parameters.image_tag }}' }}
           port: 8080
-          repository_host: ${{ parameters.repo.host }}
+          repository_host: {{ '${{ parameters.repo.host }}' }}
           deployment_name: quarkus-template
-          user: ${{ user.entity.metadata.name }}
-          verify_commits: ${{ parameters.repo.verify_commits }}
+          user: {{ '${{ user.entity.metadata.name }}' }}
+          verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
         targetPath: ./tenant-gitops
 
     - id: publish-gitops
       name: Publishing to Resource Repository
       action: publish:gitlab
       input:
-        repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}-gitops"
-        title: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
-        description: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
+        repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops"
+        title: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+        description: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
         sourcePath: ./tenant-gitops
         repoVisibility: public
 
@@ -193,16 +193,16 @@ spec:
       name: Create ArgoCD Resources
       action: argocd:create-resources
       input:
-        appName: ${{ parameters.namespace }}-${{ parameters.application_id }}-bootstrap
+        appName: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-bootstrap
         argoInstance: main
         namespace: janus-argocd
-        repoUrl: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
+        repoUrl: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
         path: 'argocd/'
 
   output:
     links:
       - title: Source Code Repository
-        url: ${{ steps.publish.output.remoteUrl }}
+        url: {{ '${{ steps.publish.output.remoteUrl }}' }}
       - title: Open Component in catalog
         icon: catalog
-        entityRef: ${{ steps.register.output.entityRef }}
\ No newline at end of file
+        entityRef: {{ '${{ steps.register.output.entityRef }}' }}
\ No newline at end of file
diff --git a/scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml b/scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml
index f9e6f3b..52554d0 100644
--- a/scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml
+++ b/scaffolder-templates/gitlab/coolstore/gateway-vertx/template.yaml
@@ -126,30 +126,30 @@ spec:
         copyWithoutTemplating:
           - .github/workflows/*
         values:
-          component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          description: ${{ parameters.description }}
-          namespace_raw: ${{ parameters.namespace }}
-          namespace: ${{ parameters.namespace }}-dev
-          owner: ${{ user.entity.metadata.name }}
-          cluster: ${{ parameters.cluster_id }}
-          host: ${{ parameters.repo.host }}
-          destination: ${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}
-          quay_destination: ${{ parameters.image_organization}}/${{ parameters.namespace }}-${{ parameters.application_id }}
+          component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          description: {{ '${{ parameters.description }}' }}
+          namespace_raw: {{ '${{ parameters.namespace }}' }}
+          namespace: {{ '${{ parameters.namespace }}' }}-dev
+          owner: {{ '${{ user.entity.metadata.name }}' }}
+          cluster: {{ '${{ parameters.cluster_id }}' }}
+          host: {{ '${{ parameters.repo.host }}' }}
+          destination: {{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          quay_destination: {{ '${{ parameters.image_organization}}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
           port: 8080
-          verify_commits: ${{ parameters.repo.verify_commits }}
+          verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
 
     - id: publish
       name: Publish
       action: publish:gitlab
       input:
-        repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}"
+        repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}"
         repoVisibility: public
 
     - id: register
       name: Register
       action: catalog:register
       input:
-        repoContentsUrl: ${{ steps.publish.output.repoContentsUrl }}
+        repoContentsUrl: {{ '${{ steps.publish.output.repoContentsUrl }}' }}
         catalogInfoPath: "/catalog-info.yaml"
 
     - id: template-gitops-deployment
@@ -159,33 +159,33 @@ spec:
         url: ./manifests
         copyWithoutTemplating: []
         values:
-          component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          description: ${{ parameters.description }}
-          destination: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
-          source_repository: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}.git
-          repository_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          git_owner: ${{ parameters.repo.owner }}
-          cluster: ${{ parameters.cluster_id }}
-          namespace: ${{ parameters.namespace }}
-          image_registry: ${{ parameters.image_registry }}
-          image_host: ${{ parameters.image_host }}
-          image_organization: ${{ parameters.image_organization }}
-          image_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          image_tag: ${{ parameters.image_tag }}
+          component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          description: {{ '${{ parameters.description }}' }}
+          destination: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
+          source_repository: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}.git
+          repository_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          git_owner: {{ '${{ parameters.repo.owner }}' }}
+          cluster: {{ '${{ parameters.cluster_id }}' }}
+          namespace: {{ '${{ parameters.namespace }}' }}
+          image_registry: {{ '${{ parameters.image_registry }}' }}
+          image_host: {{ '${{ parameters.image_host }}' }}
+          image_organization: {{ '${{ parameters.image_organization }}' }}
+          image_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          image_tag: {{ '${{ parameters.image_tag }}' }}
           port: 8080
-          repository_host: ${{ parameters.repo.host }}
+          repository_host: {{ '${{ parameters.repo.host }}' }}
           deployment_name: quarkus-template
-          user: ${{ user.entity.metadata.name }}
-          verify_commits: ${{ parameters.repo.verify_commits }}
+          user: {{ '${{ user.entity.metadata.name }}' }}
+          verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
         targetPath: ./tenant-gitops
 
     - id: publish-gitops
       name: Publishing to Resource Repository
       action: publish:gitlab
       input:
-        repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}-gitops"
-        title: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
-        description: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
+        repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops"
+        title: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+        description: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
         sourcePath: ./tenant-gitops
         repoVisibility: public
 
@@ -193,16 +193,16 @@ spec:
       name: Create ArgoCD Resources
       action: argocd:create-resources
       input:
-        appName: ${{ parameters.namespace }}-${{ parameters.application_id }}-bootstrap
+        appName: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-bootstrap
         argoInstance: main
         namespace: janus-argocd
-        repoUrl: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
+        repoUrl: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
         path: 'argocd/'
 
   output:
     links:
       - title: Source Code Repository
-        url: ${{ steps.publish.output.remoteUrl }}
+        url: {{ '${{ steps.publish.output.remoteUrl }}' }}
       - title: Open Component in catalog
         icon: catalog
-        entityRef: ${{ steps.register.output.entityRef }}
\ No newline at end of file
+        entityRef: {{ '${{ steps.register.output.entityRef }}' }}
\ No newline at end of file
diff --git a/scaffolder-templates/gitlab/coolstore/inventory-quarkus/template.yaml b/scaffolder-templates/gitlab/coolstore/inventory-quarkus/template.yaml
index c6aa1d8..c9dcf1f 100644
--- a/scaffolder-templates/gitlab/coolstore/inventory-quarkus/template.yaml
+++ b/scaffolder-templates/gitlab/coolstore/inventory-quarkus/template.yaml
@@ -126,30 +126,30 @@ spec:
         copyWithoutTemplating:
           - .github/workflows/*
         values:
-          component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          description: ${{ parameters.description }}
-          namespace_raw: ${{ parameters.namespace }}
-          namespace: ${{ parameters.namespace }}-dev
-          owner: ${{ user.entity.metadata.name }}
-          cluster: ${{ parameters.cluster_id }}
-          host: ${{ parameters.repo.host }}
-          destination: ${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}
-          quay_destination: ${{ parameters.image_organization}}/${{ parameters.namespace }}-${{ parameters.application_id }}
+          component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          description: {{ '${{ parameters.description }}' }}
+          namespace_raw: {{ '${{ parameters.namespace }}' }}
+          namespace: {{ '${{ parameters.namespace }}' }}-dev
+          owner: {{ '${{ user.entity.metadata.name }}' }}
+          cluster: {{ '${{ parameters.cluster_id }}' }}
+          host: {{ '${{ parameters.repo.host }}' }}
+          destination: {{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          quay_destination: {{ '${{ parameters.image_organization}}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
           port: 8080
-          verify_commits: ${{ parameters.repo.verify_commits }}
+          verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
 
     - id: publish
       name: Publish
       action: publish:gitlab
       input:
-        repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}"
+        repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}"
         repoVisibility: public
 
     - id: register
       name: Register
       action: catalog:register
       input:
-        repoContentsUrl: ${{ steps.publish.output.repoContentsUrl }}
+        repoContentsUrl: {{ '${{ steps.publish.output.repoContentsUrl }}' }}
         catalogInfoPath: "/catalog-info.yaml"
 
     - id: template-gitops-deployment
@@ -159,33 +159,33 @@ spec:
         url: ./manifests
         copyWithoutTemplating: []
         values:
-          component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          description: ${{ parameters.description }}
-          destination: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
-          source_repository: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}.git
-          repository_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          git_owner: ${{ parameters.repo.owner }}
-          cluster: ${{ parameters.cluster_id }}
-          namespace: ${{ parameters.namespace }}
-          image_registry: ${{ parameters.image_registry }}
-          image_host: ${{ parameters.image_host }}
-          image_organization: ${{ parameters.image_organization }}
-          image_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          image_tag: ${{ parameters.image_tag }}
+          component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          description: {{ '${{ parameters.description }}' }}
+          destination: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
+          source_repository: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}.git
+          repository_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          git_owner: {{ '${{ parameters.repo.owner }}' }}
+          cluster: {{ '${{ parameters.cluster_id }}' }}
+          namespace: {{ '${{ parameters.namespace }}' }}
+          image_registry: {{ '${{ parameters.image_registry }}' }}
+          image_host: {{ '${{ parameters.image_host }}' }}
+          image_organization: {{ '${{ parameters.image_organization }}' }}
+          image_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          image_tag: {{ '${{ parameters.image_tag }}' }}
           port: 8080
-          repository_host: ${{ parameters.repo.host }}
+          repository_host: {{ '${{ parameters.repo.host }}' }}
           deployment_name: quarkus-template
-          user: ${{ user.entity.metadata.name }}
-          verify_commits: ${{ parameters.repo.verify_commits }}
+          user: {{ '${{ user.entity.metadata.name }}' }}
+          verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
         targetPath: ./tenant-gitops
 
     - id: publish-gitops
       name: Publishing to Resource Repository
       action: publish:gitlab
       input:
-        repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}-gitops"
-        title: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
-        description: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
+        repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops"
+        title: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+        description: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
         sourcePath: ./tenant-gitops
         repoVisibility: public
 
@@ -193,16 +193,16 @@ spec:
       name: Create ArgoCD Resources
       action: argocd:create-resources
       input:
-        appName: ${{ parameters.namespace }}-${{ parameters.application_id }}-bootstrap
+        appName: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-bootstrap
         argoInstance: main
         namespace: janus-argocd
-        repoUrl: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
+        repoUrl: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
         path: 'argocd/'
 
   output:
     links:
       - title: Source Code Repository
-        url: ${{ steps.publish.output.remoteUrl }}
+        url: {{ '${{ steps.publish.output.remoteUrl }}' }}
       - title: Open Component in catalog
         icon: catalog
-        entityRef: ${{ steps.register.output.entityRef }}
\ No newline at end of file
+        entityRef: {{ '${{ steps.register.output.entityRef }}' }}
\ No newline at end of file
diff --git a/scaffolder-templates/gitlab/coolstore/web-nodejs/template.yaml b/scaffolder-templates/gitlab/coolstore/web-nodejs/template.yaml
index f588047..a2374e2 100644
--- a/scaffolder-templates/gitlab/coolstore/web-nodejs/template.yaml
+++ b/scaffolder-templates/gitlab/coolstore/web-nodejs/template.yaml
@@ -125,30 +125,30 @@ spec:
         copyWithoutTemplating:
           - .github/workflows/*
         values:
-          component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          description: ${{ parameters.description }}
-          namespace_raw: ${{ parameters.namespace }}
-          namespace: ${{ parameters.namespace }}-dev
-          owner: ${{ user.entity.metadata.name }}
-          cluster: ${{ parameters.cluster_id }}
-          host: ${{ parameters.repo.host }}
-          destination: ${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}
-          quay_destination: ${{ parameters.image_organization}}/${{ parameters.namespace }}-${{ parameters.application_id }}
+          component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          description: {{ '${{ parameters.description }}' }}
+          namespace_raw: {{ '${{ parameters.namespace }}' }}
+          namespace: {{ '${{ parameters.namespace }}' }}-dev
+          owner: {{ '${{ user.entity.metadata.name }}' }}
+          cluster: {{ '${{ parameters.cluster_id }}' }}
+          host: {{ '${{ parameters.repo.host }}' }}
+          destination: {{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          quay_destination: {{ '${{ parameters.image_organization}}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
           port: 8080
-          verify_commits: ${{ parameters.repo.verify_commits }}
+          verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
 
     - id: publish
       name: Publish
       action: publish:gitlab
       input:
-        repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}"
+        repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}"
         repoVisibility: public
 
     - id: register
       name: Register
       action: catalog:register
       input:
-        repoContentsUrl: ${{ steps.publish.output.repoContentsUrl }}
+        repoContentsUrl: {{ '${{ steps.publish.output.repoContentsUrl }}' }}
         catalogInfoPath: "/catalog-info.yaml"
 
     - id: template-gitops-deployment
@@ -158,33 +158,33 @@ spec:
         url: ./manifests
         copyWithoutTemplating: []
         values:
-          component_id: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          description: ${{ parameters.description }}
-          destination: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
-          source_repository: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}.git
-          repository_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          git_owner: ${{ parameters.repo.owner }}
-          cluster: ${{ parameters.cluster_id }}
-          namespace: ${{ parameters.namespace }}
-          image_registry: ${{ parameters.image_registry }}
-          image_host: ${{ parameters.image_host }}
-          image_organization: ${{ parameters.image_organization }}
-          image_name: ${{ parameters.namespace }}-${{ parameters.application_id }}
-          image_tag: ${{ parameters.image_tag }}
+          component_id: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          description: {{ '${{ parameters.description }}' }}
+          destination: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
+          source_repository: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}.git
+          repository_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          git_owner: {{ '${{ parameters.repo.owner }}' }}
+          cluster: {{ '${{ parameters.cluster_id }}' }}
+          namespace: {{ '${{ parameters.namespace }}' }}
+          image_registry: {{ '${{ parameters.image_registry }}' }}
+          image_host: {{ '${{ parameters.image_host }}' }}
+          image_organization: {{ '${{ parameters.image_organization }}' }}
+          image_name: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+          image_tag: {{ '${{ parameters.image_tag }}' }}
           port: 8080
-          repository_host: ${{ parameters.repo.host }}
+          repository_host: {{ '${{ parameters.repo.host }}' }}
           deployment_name: nodejs-template
-          user: ${{ user.entity.metadata.name }}
-          verify_commits: ${{ parameters.repo.verify_commits }}
+          user: {{ '${{ user.entity.metadata.name }}' }}
+          verify_commits: {{ '${{ parameters.repo.verify_commits }}' }}
         targetPath: ./tenant-gitops
 
     - id: publish-gitops
       name: Publishing to Resource Repository
       action: publish:gitlab
       input:
-        repoUrl: "${{ parameters.repo.host }}?owner=${{ parameters.repo.owner }}&repo=${{ parameters.namespace }}-${{ parameters.application_id }}-gitops"
-        title: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
-        description: gitops resources for ${{ parameters.namespace }}-${{ parameters.application_id }}
+        repoUrl: "{{ '${{ parameters.repo.host }}' }}?owner={{ '${{ parameters.repo.owner }}' }}&repo={{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops"
+        title: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
+        description: gitops resources for {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}
         sourcePath: ./tenant-gitops
         repoVisibility: public
 
@@ -192,16 +192,16 @@ spec:
       name: Create ArgoCD Resources
       action: argocd:create-resources
       input:
-        appName: ${{ parameters.namespace }}-${{ parameters.application_id }}-bootstrap
+        appName: {{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-bootstrap
         argoInstance: main
         namespace: janus-argocd
-        repoUrl: https://${{ parameters.repo.host }}/${{ parameters.repo.owner }}/${{ parameters.namespace }}-${{ parameters.application_id }}-gitops.git
+        repoUrl: https://{{ '${{ parameters.repo.host }}' }}/{{ '${{ parameters.repo.owner }}' }}/{{ '${{ parameters.namespace }}' }}-{{ '${{ parameters.application_id }}' }}-gitops.git
         path: 'argocd/'
 
   output:
     links:
       - title: Source Code Repository
-        url: ${{ steps.publish.output.remoteUrl }}
+        url: {{ '${{ steps.publish.output.remoteUrl }}' }}
       - title: Open Component in catalog
         icon: catalog
-        entityRef: ${{ steps.register.output.entityRef }}
\ No newline at end of file
+        entityRef: {{ '${{ steps.register.output.entityRef }}' }}
\ No newline at end of file