diff --git a/catalog/142f0054-d9ae-4352-8618-887104a81928.yaml b/catalog/142f0054-d9ae-4352-8618-887104a81928.yaml
index ccc78f6967..73984cbb7e 100644
--- a/catalog/142f0054-d9ae-4352-8618-887104a81928.yaml
+++ b/catalog/142f0054-d9ae-4352-8618-887104a81928.yaml
@@ -317,37 +317,26 @@ services:
         whiteboardData:
           style:
             z-index: 12
-  frontend-iedxc:
+  frontend-bvvsl:
     name: frontend
-    type: Deployment
-    apiVersion: apps/v1
+    type: Service
+    apiVersion: v1
     namespace: default
     model: kubernetes
+    labels:
+      app: guestbook
+      tier: frontend
     settings:
       spec:
-        replicas: 3
+        ports:
+        - port: 80
+          protocol: TCP
+        - port: 80
+          protocol: TCP
         selector:
-          match Labels:
-            app: guestbook
-            tier: frontend
-        template:
-          metadata:
-            labels:
-              app: guestbook
-              tier: frontend
-          spec:
-            containers:
-            - env:
-              - name: GET_HOSTS_FROM
-                value: dns
-              image: gcr.io/google-samples/gb-frontend:v4
-              name: php-redis
-              ports:
-              - container Port: 80
-              resources:
-                requests:
-                  cpu: 100m
-                  memory: 100Mi
+          app: guestbook
+          tier: frontend
+        type: NodePort
     traits:
       meshmap:
         edges:
@@ -747,53 +736,64 @@ services:
               name: z-index-compare
               strValue: manual
               value: manual
-        id: 11bd2f2c-70b6-448e-b16b-7f2ac2215b1f
+        id: a39108f2-136d-45c2-92ef-fa0125257e27
         label: frontend
         meshmodel-metadata:
           capabilities: ""
-          genealogy: parent
+          genealogy: ""
           isAnnotation: false
           isCustomResource: false
           isModelAnnotation: "FALSE"
           isNamespaced: true
-          logoURL: Created by leecalcote
+          logoURL: https://github.com/cncf/artwork/blob/master/projects/kubernetes/icon/white/kubernetes-icon-white.svg
           model: kubernetes
           modelDisplayName: Kubernetes
           primaryColor: '#326CE5'
           published: true
           secondaryColor: '#7aa1f0'
-          shape: round-pentagon
-          styleOverrides: '{"background-image":"none","border-width":2,"background-opacity":0.5}'
+          shape: round-triangle
+          styleOverrides: '{"height":20,"width":20,"padding":12,"background-fit":"none","background-position-y":4.5,"x":"10px","y":"12px"}'
           subCategory: Scheduling & Orchestration
-          svgColor: ui/public/static/img/meshmodels/kubernetes/color/deployment-color.svg
-          svgComplete: ui/public/static/img/meshmodels/kubernetes/complete/deployment-complete.svg
-          svgWhite: ui/public/static/img/meshmodels/kubernetes/color/deployment-color.svg
+          svgColor: ui/public/static/img/meshmodels/kubernetes/color/connection-color.svg
+          svgComplete: ""
+          svgWhite: ui/public/static/img/meshmodels/kubernetes/white/connection-white.svg
         position:
-          posX: 445.455108517379
-          posY: 369.30701490605486
+          posX: 393.5880205782648
+          posY: 263.8706307102228
         whiteboardData:
           style:
-            z-index: 10018
-  frontend-klfdn:
+            z-index: 9
+  frontend-nmdnw:
     name: frontend
-    type: Service
-    apiVersion: v1
+    type: Deployment
+    apiVersion: apps/v1
     namespace: default
     model: kubernetes
-    labels:
-      app: guestbook
-      tier: frontend
     settings:
       spec:
-        ports:
-        - port: 80
-          protocol: TCP
-        - port: 80
-          protocol: TCP
+        replicas: 3
         selector:
-          app: guestbook
-          tier: frontend
-        type: NodePort
+          match Labels:
+            app: guestbook
+            tier: frontend
+        template:
+          metadata:
+            labels:
+              app: guestbook
+              tier: frontend
+          spec:
+            containers:
+            - env:
+              - name: GET_HOSTS_FROM
+                value: dns
+              image: gcr.io/google-samples/gb-frontend:v4
+              name: php-redis
+              ports:
+              - container Port: 80
+              resources:
+                requests:
+                  cpu: 100m
+                  memory: 100Mi
     traits:
       meshmap:
         edges:
@@ -1193,34 +1193,34 @@ services:
               name: z-index-compare
               strValue: manual
               value: manual
-        id: a39108f2-136d-45c2-92ef-fa0125257e27
+        id: 11bd2f2c-70b6-448e-b16b-7f2ac2215b1f
         label: frontend
         meshmodel-metadata:
           capabilities: ""
-          genealogy: ""
+          genealogy: parent
           isAnnotation: false
           isCustomResource: false
           isModelAnnotation: "FALSE"
           isNamespaced: true
-          logoURL: https://github.com/cncf/artwork/blob/master/projects/kubernetes/icon/white/kubernetes-icon-white.svg
+          logoURL: Created by leecalcote
           model: kubernetes
           modelDisplayName: Kubernetes
           primaryColor: '#326CE5'
           published: true
           secondaryColor: '#7aa1f0'
-          shape: round-triangle
-          styleOverrides: '{"height":20,"width":20,"padding":12,"background-fit":"none","background-position-y":4.5,"x":"10px","y":"12px"}'
+          shape: round-pentagon
+          styleOverrides: '{"background-image":"none","border-width":2,"background-opacity":0.5}'
           subCategory: Scheduling & Orchestration
-          svgColor: ui/public/static/img/meshmodels/kubernetes/color/connection-color.svg
-          svgComplete: ""
-          svgWhite: ui/public/static/img/meshmodels/kubernetes/white/connection-white.svg
+          svgColor: ui/public/static/img/meshmodels/kubernetes/color/deployment-color.svg
+          svgComplete: ui/public/static/img/meshmodels/kubernetes/complete/deployment-complete.svg
+          svgWhite: ui/public/static/img/meshmodels/kubernetes/color/deployment-color.svg
         position:
-          posX: 393.5880205782648
-          posY: 263.8706307102228
+          posX: 445.455108517379
+          posY: 369.30701490605486
         whiteboardData:
           style:
-            z-index: 9
-  redis-master-qmjuj:
+            z-index: 10016
+  redis-master-dxdcz:
     name: redis-master
     type: Service
     apiVersion: v1
@@ -2069,7 +2069,7 @@ services:
         whiteboardData:
           style:
             z-index: 6
-  redis-master-wcoif:
+  redis-master-wvmcb:
     name: redis-master
     type: Deployment
     apiVersion: apps/v1
@@ -2920,44 +2920,51 @@ services:
           posY: 228.61539914227518
         whiteboardData:
           style:
-            z-index: 10016
-  redis-replica-apjbj:
+            z-index: 10022
+  redis-replica-lvtxn:
     name: redis-replica
-    type: Service
-    apiVersion: v1
+    type: Deployment
+    apiVersion: apps/v1
     namespace: default
     model: kubernetes
-    labels:
-      against: me
-      app: redis
-      role: replica
-      tier: backend
     settings:
       spec:
-        ports:
-        - port: 6379
-          protocol: TCP
-        - port: 6379
-          protocol: TCP
-        - port: 6379
-          protocol: TCP
-        - port: 6379
-          protocol: TCP
+        replicas: 2
         selector:
-          app: redis
-          role: replica
-          tier: backend
+          match Labels:
+            app: redis
+            role: replica
+            tier: backend
+        template:
+          metadata:
+            labels:
+              app: redis
+              role: replica
+              tier: backend
+          spec:
+            containers:
+            - env:
+              - name: GET_HOSTS_FROM
+                value: dns
+              image: gcr.io/google_samples/gb-redisslave:v1
+              name: replica
+              ports:
+              - container Port: 6379
+              resources:
+                requests:
+                  cpu: 100m
+                  memory: 100Mi
     traits:
       meshmap:
         edges:
         - data:
-            id: 6fbb3b6e-e9a5-4722-bd49-e2b9812abb0b
+            id: e73d35e7-9988-4f69-812c-2010b4988fba
             metadata:
               port: 6379
               protocol: TCP
-            source: 5fec14fc-0873-4232-ab86-ceb6592a9767
+            source: a8126c59-8ff5-4736-8d8a-0aadfcfe19f0
             subType: Network
-            target: 8aae645a-1f9e-48dd-9ed6-0457d2ebe4ae
+            target: 83acbd17-dfcb-4092-80c7-be033e38876d
           style:
             curve-style:
               bypass: true
@@ -3149,13 +3156,13 @@ services:
               strValue: manual
               value: manual
         - data:
-            id: 7c451d61-36f6-47bc-bfbb-a26c2c229772
+            id: 2c89f012-de88-409f-9d23-f617b3235f58
             metadata:
               port: 6379
               protocol: TCP
-            source: 5fec14fc-0873-4232-ab86-ceb6592a9767
+            source: a8126c59-8ff5-4736-8d8a-0aadfcfe19f0
             subType: Network
-            target: 8aae645a-1f9e-48dd-9ed6-0457d2ebe4ae
+            target: 83acbd17-dfcb-4092-80c7-be033e38876d
           style:
             curve-style:
               bypass: true
@@ -3742,66 +3749,59 @@ services:
               name: z-index-compare
               strValue: manual
               value: manual
-        id: 5fec14fc-0873-4232-ab86-ceb6592a9767
+        id: 83acbd17-dfcb-4092-80c7-be033e38876d
         label: redis-replica
         meshmodel-metadata:
           capabilities: ""
-          genealogy: ""
+          genealogy: parent
           isAnnotation: false
           isCustomResource: false
           isModelAnnotation: "FALSE"
           isNamespaced: true
-          logoURL: https://github.com/cncf/artwork/blob/master/projects/kubernetes/icon/white/kubernetes-icon-white.svg
+          logoURL: Created by leecalcote
           model: kubernetes
           modelDisplayName: Kubernetes
           primaryColor: '#326CE5'
           published: true
           secondaryColor: '#7aa1f0'
-          shape: round-triangle
-          styleOverrides: '{"height":20,"width":20,"padding":12,"background-fit":"none","background-position-y":4.5,"x":"10px","y":"12px"}'
+          shape: round-pentagon
+          styleOverrides: '{"background-image":"none","border-width":2,"background-opacity":0.5}'
           subCategory: Scheduling & Orchestration
-          svgColor: ui/public/static/img/meshmodels/kubernetes/color/connection-color.svg
-          svgComplete: ""
-          svgWhite: ui/public/static/img/meshmodels/kubernetes/white/connection-white.svg
+          svgColor: ui/public/static/img/meshmodels/kubernetes/color/deployment-color.svg
+          svgComplete: ui/public/static/img/meshmodels/kubernetes/complete/deployment-complete.svg
+          svgWhite: ui/public/static/img/meshmodels/kubernetes/color/deployment-color.svg
         position:
-          posX: 673.341592965927
-          posY: 295.2622076034476
+          posX: 734.8663558272586
+          posY: 206.51857263887237
         whiteboardData:
           style:
-            z-index: 5
-  redis-replica-iiawb:
+            z-index: 10018
+  redis-replica-ovabc:
     name: redis-replica
-    type: Deployment
-    apiVersion: apps/v1
+    type: Service
+    apiVersion: v1
     namespace: default
     model: kubernetes
+    labels:
+      against: me
+      app: redis
+      role: replica
+      tier: backend
     settings:
       spec:
-        replicas: 2
+        ports:
+        - port: 6379
+          protocol: TCP
+        - port: 6379
+          protocol: TCP
+        - port: 6379
+          protocol: TCP
+        - port: 6379
+          protocol: TCP
         selector:
-          match Labels:
-            app: redis
-            role: replica
-            tier: backend
-        template:
-          metadata:
-            labels:
-              app: redis
-              role: replica
-              tier: backend
-          spec:
-            containers:
-            - env:
-              - name: GET_HOSTS_FROM
-                value: dns
-              image: gcr.io/google_samples/gb-redisslave:v1
-              name: replica
-              ports:
-              - container Port: 6379
-              resources:
-                requests:
-                  cpu: 100m
-                  memory: 100Mi
+          app: redis
+          role: replica
+          tier: backend
     traits:
       meshmap:
         edges:
@@ -4202,13 +4202,13 @@ services:
               strValue: manual
               value: manual
         - data:
-            id: e73d35e7-9988-4f69-812c-2010b4988fba
+            id: 6fbb3b6e-e9a5-4722-bd49-e2b9812abb0b
             metadata:
               port: 6379
               protocol: TCP
-            source: a8126c59-8ff5-4736-8d8a-0aadfcfe19f0
+            source: 5fec14fc-0873-4232-ab86-ceb6592a9767
             subType: Network
-            target: 83acbd17-dfcb-4092-80c7-be033e38876d
+            target: 8aae645a-1f9e-48dd-9ed6-0457d2ebe4ae
           style:
             curve-style:
               bypass: true
@@ -4400,13 +4400,13 @@ services:
               strValue: manual
               value: manual
         - data:
-            id: 2c89f012-de88-409f-9d23-f617b3235f58
+            id: 7c451d61-36f6-47bc-bfbb-a26c2c229772
             metadata:
               port: 6379
               protocol: TCP
-            source: a8126c59-8ff5-4736-8d8a-0aadfcfe19f0
+            source: 5fec14fc-0873-4232-ab86-ceb6592a9767
             subType: Network
-            target: 83acbd17-dfcb-4092-80c7-be033e38876d
+            target: 8aae645a-1f9e-48dd-9ed6-0457d2ebe4ae
           style:
             curve-style:
               bypass: true
@@ -4597,33 +4597,33 @@ services:
               name: z-index-compare
               strValue: manual
               value: manual
-        id: 83acbd17-dfcb-4092-80c7-be033e38876d
+        id: 5fec14fc-0873-4232-ab86-ceb6592a9767
         label: redis-replica
         meshmodel-metadata:
           capabilities: ""
-          genealogy: parent
+          genealogy: ""
           isAnnotation: false
           isCustomResource: false
           isModelAnnotation: "FALSE"
           isNamespaced: true
-          logoURL: Created by leecalcote
+          logoURL: https://github.com/cncf/artwork/blob/master/projects/kubernetes/icon/white/kubernetes-icon-white.svg
           model: kubernetes
           modelDisplayName: Kubernetes
           primaryColor: '#326CE5'
           published: true
           secondaryColor: '#7aa1f0'
-          shape: round-pentagon
-          styleOverrides: '{"background-image":"none","border-width":2,"background-opacity":0.5}'
+          shape: round-triangle
+          styleOverrides: '{"height":20,"width":20,"padding":12,"background-fit":"none","background-position-y":4.5,"x":"10px","y":"12px"}'
           subCategory: Scheduling & Orchestration
-          svgColor: ui/public/static/img/meshmodels/kubernetes/color/deployment-color.svg
-          svgComplete: ui/public/static/img/meshmodels/kubernetes/complete/deployment-complete.svg
-          svgWhite: ui/public/static/img/meshmodels/kubernetes/color/deployment-color.svg
+          svgColor: ui/public/static/img/meshmodels/kubernetes/color/connection-color.svg
+          svgComplete: ""
+          svgWhite: ui/public/static/img/meshmodels/kubernetes/white/connection-white.svg
         position:
-          posX: 734.8663558272586
-          posY: 206.51857263887237
+          posX: 673.341592965927
+          posY: 295.2622076034476
         whiteboardData:
           style:
-            z-index: 10022
+            z-index: 5
   section-xe:
     name: section-xe
     type: Section