diff --git a/resources/training-portal.yaml b/resources/training-portal.yaml
index 5391bf5..53d5789 100644
--- a/resources/training-portal.yaml
+++ b/resources/training-portal.yaml
@@ -1,7 +1,7 @@
 apiVersion: training.eduk8s.io/v1alpha1
 kind: TrainingPortal
 metadata:
-  name: tce-worksops
+  name: tce-workshops
 spec:
   portal:
     registration:
diff --git a/resources/workshop.yaml b/resources/workshop.yaml
index c9dae2d..774d4ac 100644
--- a/resources/workshop.yaml
+++ b/resources/workshop.yaml
@@ -28,12 +28,76 @@ spec:
     - apiVersion: rbac.authorization.k8s.io/v1
       kind: ClusterRoleBinding
       metadata:
-        name: $(session_namespace)-cluster-admin
+        name: $(session_namespace)-tanzu-addons-manager
       roleRef:
         apiGroup: rbac.authorization.k8s.io
         kind: ClusterRole
-        name: cluster-admin
+        name: tanzu-addons-manager-clusterrole
       subjects:
       - kind: ServiceAccount
         namespace: $(workshop_namespace)
-        name: $(service_account)    
+        name: $(service_account)
+    - apiVersion: rbac.authorization.k8s.io/v1 
+      kind: ClusterRoleBinding
+      metadata:
+        name: $(session_namespace)-tanzu-capabilities-manager
+      roleRef:
+        apiGroup: rbac.authorization.k8s.io
+        kind: ClusterRole
+        name: tanzu-capabilities-manager-clusterrole
+      subjects:
+      - kind: ServiceAccount
+        namespace: $(workshop_namespace)
+        name: $(service_account) 
+    - apiVersion: rbac.authorization.k8s.io/v1 
+      kind: ClusterRoleBinding
+      metadata:
+        name: $(session_namespace)-data-packagemanager-carvel
+      roleRef:
+        apiGroup: rbac.authorization.k8s.io
+        kind: ClusterRole
+        name:  $(workshop_namespace)-data-packagemanager-carvel
+      subjects:
+      - kind: ServiceAccount
+        namespace: $(workshop_namespace)
+        name: $(service_account)
+    - apiVersion: rbac.authorization.k8s.io/v1 
+      kind: ClusterRoleBinding
+      metadata:
+        name: $(session_namespace)-monitorns-view
+      roleRef:
+        apiGroup: rbac.authorization.k8s.io
+        kind: ClusterRole
+        name:  $(workshop_namespace)-monitorns-view
+      subjects:
+      - kind: ServiceAccount
+        namespace: $(workshop_namespace)
+        name: $(service_account)         
+  environment:
+    objects:
+    - apiVersion: rbac.authorization.k8s.io/v1
+      kind: ClusterRole
+      metadata:
+        name: $(workshop_namespace)-data-packagemanager-carvel
+      rules:
+        - apiGroups:
+            - data.packaging.carvel.dev
+          resources:
+            - packagemetadatas
+          verbs:
+            - get
+            - list
+            - watch
+    - apiVersion: rbac.authorization.k8s.io/v1
+      kind: ClusterRole
+      metadata:
+        name: $(workshop_namespace)-monitorns-view
+      rules:
+        - apiGroups:
+            - ""
+          resources:
+            - pods
+          verbs:
+            - get
+            - list
+            - watch
\ No newline at end of file
diff --git a/workshop/content/summary.md b/workshop/content/summary.md
index 7e5b2a9..c37aef3 100644
--- a/workshop/content/summary.md
+++ b/workshop/content/summary.md
@@ -4,8 +4,9 @@ It also helps installing additional tooling needed to Update, Manage and Monitor
 
 To learn More about Tanzu Community Edition:
 
-Website: **tanzucommunityedition.io**
-Github:  **vmware-tanzu/community-edition**
+- Website: tanzucommunityedition.io
+- Github:  vmware-tanzu/community-edition
 
+Learn more about Tanzu via various interactive environments on https://learn.tanzu.io
 
-Thank you!
\ No newline at end of file
+Thank you!
diff --git a/workshop/workshop.yaml b/workshop/workshop.yaml
index c953396..8d2b665 100644
--- a/workshop/workshop.yaml
+++ b/workshop/workshop.yaml
@@ -1,4 +1,4 @@
-name: Cloud Native Runtimes
+name: tce dev guide
 
 modules:
     activate: