diff --git a/appsso-starter-java/accelerator.yaml b/appsso-starter-java/accelerator.yaml
index cbbf738bd..daf34d15b 100644
--- a/appsso-starter-java/accelerator.yaml
+++ b/appsso-starter-java/accelerator.yaml
@@ -12,8 +12,26 @@ accelerator:
     - name: tap-workload
 
 engine:
-  merge:
-  - type: InvokeFragment
-    reference: tap-workload
-  - include: [ "**" ]
-  onConflict: UseFirst
+  chain:
+    - merge:
+      - include: [ "**" ]
+        exclude: [ "catalog/*.yaml", "config/workload.yaml" ]
+      - include: [ "catalog/*.yaml" ]
+        chain:
+          - type: ReplaceText
+            substitutions:
+              - text: "appsso-starter-java"
+                with: "#artifactId.toLowerCase()"
+      - include: [ "config/workload.yaml" ]
+        chain:
+          - type: ReplaceText
+            substitutions:
+              - text: "\n  name: appsso-starter-java"
+                with: "'\n  name: ' + #artifactId.toLowerCase()"
+              - text: "app.kubernetes.io/part-of: appsso-starter-java"
+                with: "'app.kubernetes.io/part-of: ' + #artifactId.toLowerCase()"
+    - merge:
+      - type: InvokeFragment
+        reference: tap-workload
+      - include: [ "**" ]
+      onConflict: UseFirst
diff --git a/appsso-starter-java/catalog/catalog-info.yaml b/appsso-starter-java/catalog/catalog-info.yaml
index 35c14d252..601ffa1d4 100644
--- a/appsso-starter-java/catalog/catalog-info.yaml
+++ b/appsso-starter-java/catalog/catalog-info.yaml
@@ -5,7 +5,6 @@ metadata:
   description: Spring Boot application that supports single sign-on (SSO) via Spring Security OAuth 2 Client library.
   tags:
     - sso
-    - app-accelerator
     - authentication
     - openid
     - spring
diff --git a/java-rest-service/accelerator.yaml b/java-rest-service/accelerator.yaml
index b99ea7d75..e1758f616 100644
--- a/java-rest-service/accelerator.yaml
+++ b/java-rest-service/accelerator.yaml
@@ -229,14 +229,6 @@ engine:
             substitutions:
               - text: "rest-service-db"
                 with: "#workloadResourceName"
-#          - type: ReplaceText
-#            substitutions:
-#              - text: "customer-profile-database"
-#                with: "#databaseResourceName"
-#          - type: ReplaceText
-#            substitutions:
-#              - text: "customerprofiledatabase"
-#                with: "#databaseName"
     - merge:
       - type: InvokeFragment
         reference: java-version
diff --git a/spring-smtp-gateway/accelerator.yaml b/spring-smtp-gateway/accelerator.yaml
index 6a0d04ec7..a480b2d98 100644
--- a/spring-smtp-gateway/accelerator.yaml
+++ b/spring-smtp-gateway/accelerator.yaml
@@ -69,7 +69,7 @@ accelerator:
 engine:
   merge:
   - exclude: 
-      ["**/templates/**", "**/icons/**", "**/.git/**"]
+      ["**/templates/**", "**/icons/**", "**/.git/**", "**/catalog/catalog.yaml"]
   - include: ["**/config/workload.yaml", "**/templates/workloads.template"]
     chain:
     - type: ReplaceText
@@ -81,10 +81,26 @@ engine:
         - text: "1026"
           with: "#containerPort"     
         - text: "25"
-          with: "#servicePort"    
+          with: "#servicePort"
+        - text: "name: smtp-gateway"
+          with: "'name: ' + #artifactId.toLowerCase() + '-smtp-gateway'"
+        - text: "name: smtp-sink"
+          with: "'name: ' + #artifactId.toLowerCase() + '-smtp-sink'"
+        - text: "app.kubernetes.io/part-of: spring-smtp-gateway"
+          with: "'app.kubernetes.io/part-of: ' + #artifactId.toLowerCase()"
     - type: RewritePath
       regex: 'templates/workloads.template'
-      rewriteTo: "'config/developer/workloads.yaml'"                
+      rewriteTo: "'config/developer/workloads.yaml'"
+  - include: [ "**/catalog/catalog.yaml" ]
+    chain:
+      - type: ReplaceText
+        substitutions:
+          - text: "name: smtp-gateway"
+            with: "'name: ' + #artifactId.toLowerCase() + '-smtp-gateway'"
+          - text: "name: smtp-sink"
+            with: "'name: ' + #artifactId.toLowerCase() + '-smtp-sink'"
+          - text: "app.kubernetes.io/part-of=spring-smtp-gateway"
+            with: "'app.kubernetes.io/part-of=' + #artifactId.toLowerCase()"
   - condition:
       "#createRabbitMQCluster"
     include: ["**/rmqCluster.template"]
diff --git a/spring-smtp-gateway/smtp-gateway/catalog/catalog.yaml b/spring-smtp-gateway/smtp-gateway/catalog/catalog.yaml
index e1cb28d9b..37220eb18 100644
--- a/spring-smtp-gateway/smtp-gateway/catalog/catalog.yaml
+++ b/spring-smtp-gateway/smtp-gateway/catalog/catalog.yaml
@@ -1,7 +1,7 @@
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
- name: smpt-gateway
+ name: smtp-gateway
  description: SMTP server application
  tags:
    - tanzu
diff --git a/spring-smtp-gateway/smtp-sink/catalog/catalog.yaml b/spring-smtp-gateway/smtp-sink/catalog/catalog.yaml
index dadd57a6f..1b772357a 100644
--- a/spring-smtp-gateway/smtp-sink/catalog/catalog.yaml
+++ b/spring-smtp-gateway/smtp-sink/catalog/catalog.yaml
@@ -2,7 +2,7 @@ apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
  name: smtp-sink
- description: A sink/desitination for SMTP Mime messages.  
+ description: A sink/destination for SMTP Mime messages.
  tags:
    - tanzu
  links: