diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2a8645f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.hugo_build.lock
diff --git a/workshops/lab-builtin-vcluster/resources/workshop.yaml b/workshops/lab-builtin-vcluster/resources/workshop.yaml
index d8c53bd..72bc71c 100644
--- a/workshops/lab-builtin-vcluster/resources/workshop.yaml
+++ b/workshops/lab-builtin-vcluster/resources/workshop.yaml
@@ -1,3 +1,9 @@
+#@ load("@ytt:data", "data")
+
+#@ imageCaching = getattr(data.values, "imageCaching", True)
+#@ localContent = getattr(data.values, "localContent", False)
+
+---
 apiVersion: training.educates.dev/v1beta1
 kind: Workshop
 metadata:
@@ -5,12 +11,21 @@ metadata:
 spec:
   title: "Test of builtin virtual cluster"
   description: "Test of using builtin support for creating a virtual cluster."
+  publish:
+    image: $(image_repository)/labs-vcluster-testing/lab-builtin-vcluster-files:$(workshop_version)
+    files:
+    - directory:
+        path: workshop
+      path: workshop
   workshop:
     files:
+    #@ if imageCaching:
     - http:
-        url: http://$(assets_repository)/workshops/lab-builtin-vcluster/.tgz
-      includePaths:
-      - /workshop/**
+        url: http://$(assets_repository)/.tgz
+    #@ else:
+    - image:
+        url: $(image_repository)/labs-vcluster-testing/lab-builtin-vcluster-files:$(workshop_version)
+    #@ end
   session:
     namespaces:
       budget: medium
@@ -18,6 +33,18 @@ spec:
         token:
           enabled: false
     applications:
+      workshop:
+        enabled: true
+        #@ if localContent:
+        proxy:
+          protocol: http
+          host: localhost.$(ingress_domain)
+          port: 10081
+          changeOrigin: false
+          headers:
+          - name: X-Session-Name
+            value: $(session_name)
+        #@ end
       terminal:
         enabled: true
         layout: split
@@ -30,7 +57,7 @@ spec:
   environment:
     assets:
       files:
+      #@ if imageCaching:
       - image:
-          url: $(image_repository)/labs-vcluster-testing-files:latest
-        includePaths:
-        - /workshops/lab-builtin-vcluster/**
+          url: $(image_repository)/labs-vcluster-testing/lab-builtin-vcluster-files:$(workshop_version)
+      #@ end
diff --git a/workshops/lab-builtin-vcluster/workshop/config.yaml b/workshops/lab-builtin-vcluster/workshop/config.yaml
new file mode 100644
index 0000000..1946240
--- /dev/null
+++ b/workshops/lab-builtin-vcluster/workshop/config.yaml
@@ -0,0 +1,31 @@
+# pathways:
+#   default: workshop
+#
+#   paths:
+#     workshop:
+#       title: "Workshop"
+#
+#       steps:
+#       - 00-workshop-overview
+#       - 01-workshop-instructions
+#       - 99-workshop-summary
+#
+#       params:
+#       - name: NAME
+#         value: undefined
+#         aliases:
+#         - ALIAS
+
+# modules:
+# - name: 00-workshop-overview
+#   title: Workshop Overview
+# - name: 01-workshop-instructions
+#   title: Workshop Instructions
+# - name: 99-workshop-summary
+#   title: Workshop Summary
+
+# params:
+# - name: NAME
+#   value: undefined
+#   aliases:
+#   - ALIAS
diff --git a/workshops/lab-builtin-vcluster/workshop/modules.yaml b/workshops/lab-builtin-vcluster/workshop/modules.yaml
deleted file mode 100644
index e89729d..0000000
--- a/workshops/lab-builtin-vcluster/workshop/modules.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-modules:
-  00-workshop-overview:
-    name: Workshop Overview
-    exit_sign: Start Workshop
-  01-workshop-instructions:
-    name: Workshop Instructions
-  99-workshop-summary:
-    name: Workshop Summary
-    exit_sign: Finish Workshop
diff --git a/workshops/lab-builtin-vcluster/workshop/workshop.yaml b/workshops/lab-builtin-vcluster/workshop/workshop.yaml
deleted file mode 100644
index 47cd5fc..0000000
--- a/workshops/lab-builtin-vcluster/workshop/workshop.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "Workshop"
-
-modules:
-  activate:
-  - 00-workshop-overview
-  - 01-workshop-instructions
-  - 99-workshop-summary
diff --git a/workshops/lab-remote-cluster/resources/workshop.yaml b/workshops/lab-remote-cluster/resources/workshop.yaml
index 73c8230..74578c6 100644
--- a/workshops/lab-remote-cluster/resources/workshop.yaml
+++ b/workshops/lab-remote-cluster/resources/workshop.yaml
@@ -1,3 +1,9 @@
+#@ load("@ytt:data", "data")
+
+#@ imageCaching = getattr(data.values, "imageCaching", True)
+#@ localContent = getattr(data.values, "localContent", False)
+
+---
 apiVersion: training.educates.dev/v1beta1
 kind: Workshop
 metadata:
@@ -5,12 +11,28 @@ metadata:
 spec:
   title: "Test of using a remote cluster"
   description: "Test of using remote cluster and single namespace per session."
+  publish:
+    image: $(image_repository)/labs-vcluster-testing/lab-remote-cluster-files:$(workshop_version)
+    files:
+    - directory:
+        path: workshop
+      path: workshop
+    - directory:
+        path: ../../packages
+      path: packages
   workshop:
     files:
+    #@ if imageCaching:
     - http:
-        url: http://$(assets_repository)/workshops/lab-remote-cluster/.tgz
+        url: http://$(assets_repository)/.tgz
+      includePaths:
+      - workshop/**
+    #@ else:
+    - image:
+        url: $(image_repository)/labs-vcluster-testing/lab-remote-cluster-files:$(workshop_version)
       includePaths:
-      - /workshop/**
+      - workshop/**
+    #@ end
   session:
     namespaces:
       budget: medium
@@ -18,6 +40,18 @@ spec:
         token:
           enabled: false
     applications:
+      workshop:
+        enabled: true
+        #@ if localContent:
+        proxy:
+          protocol: http
+          host: localhost.$(ingress_domain)
+          port: 10081
+          changeOrigin: false
+          headers:
+          - name: X-Session-Name
+            value: $(session_name)
+        #@ end
       terminal:
         enabled: true
         layout: split
@@ -105,9 +139,16 @@ spec:
             name: admin-credentials-$(session_name)
             key: config
         fetch:
+        #@ if imageCaching:
         - http:
             url: http://$(assets_repository)/packages/developer-namespace/.tgz
           path: packages/developer-namespace
+        #@ else:
+        - image:
+            url: $(image_repository)/labs-vcluster-testing/lab-remote-cluster-files:$(workshop_version)
+          includePaths:
+          - packages/developer-namespace/**
+        #@ end
         template:
         - ytt:
             paths:
@@ -123,10 +164,7 @@ spec:
     assets:
       files:
       - image:
-          url: $(image_repository)/labs-vcluster-testing-files:latest
-        includePaths:
-        - /workshops/lab-remote-cluster/**
-        - /packages/**
+          url: $(image_repository)/labs-vcluster-testing/lab-remote-cluster-files:latest
     objects:
     - apiVersion: v1
       kind: ServiceAccount
@@ -163,9 +201,16 @@ spec:
         syncPeriod: 720h
         noopDelete: true
         fetch:
+        #@ if imageCaching:
         - http:
             url: http://$(assets_repository)/packages/cluster-credentials/.tgz
           path: packages/cluster-credentials
+        #@ else:
+        - image:
+            url: $(image_repository)/labs-vcluster-testing/lab-remote-cluster-files:$(workshop_version)
+          includePaths:
+          - packages/cluster-credentials/**
+        #@ end
         template:
         - ytt:
             paths:
diff --git a/workshops/lab-remote-cluster/workshop/config.yaml b/workshops/lab-remote-cluster/workshop/config.yaml
new file mode 100644
index 0000000..1946240
--- /dev/null
+++ b/workshops/lab-remote-cluster/workshop/config.yaml
@@ -0,0 +1,31 @@
+# pathways:
+#   default: workshop
+#
+#   paths:
+#     workshop:
+#       title: "Workshop"
+#
+#       steps:
+#       - 00-workshop-overview
+#       - 01-workshop-instructions
+#       - 99-workshop-summary
+#
+#       params:
+#       - name: NAME
+#         value: undefined
+#         aliases:
+#         - ALIAS
+
+# modules:
+# - name: 00-workshop-overview
+#   title: Workshop Overview
+# - name: 01-workshop-instructions
+#   title: Workshop Instructions
+# - name: 99-workshop-summary
+#   title: Workshop Summary
+
+# params:
+# - name: NAME
+#   value: undefined
+#   aliases:
+#   - ALIAS
diff --git a/workshops/lab-remote-cluster/workshop/modules.yaml b/workshops/lab-remote-cluster/workshop/modules.yaml
deleted file mode 100644
index e89729d..0000000
--- a/workshops/lab-remote-cluster/workshop/modules.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-modules:
-  00-workshop-overview:
-    name: Workshop Overview
-    exit_sign: Start Workshop
-  01-workshop-instructions:
-    name: Workshop Instructions
-  99-workshop-summary:
-    name: Workshop Summary
-    exit_sign: Finish Workshop
diff --git a/workshops/lab-remote-cluster/workshop/workshop.yaml b/workshops/lab-remote-cluster/workshop/workshop.yaml
deleted file mode 100644
index 47cd5fc..0000000
--- a/workshops/lab-remote-cluster/workshop/workshop.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: "Workshop"
-
-modules:
-  activate:
-  - 00-workshop-overview
-  - 01-workshop-instructions
-  - 99-workshop-summary
diff --git a/workshops/lab-shared-vcluster/resources/workshop.yaml b/workshops/lab-shared-vcluster/resources/workshop.yaml
index adee76b..ea7898c 100644
--- a/workshops/lab-shared-vcluster/resources/workshop.yaml
+++ b/workshops/lab-shared-vcluster/resources/workshop.yaml
@@ -1,3 +1,9 @@
+#@ load("@ytt:data", "data")
+
+#@ imageCaching = getattr(data.values, "imageCaching", True)
+#@ localContent = getattr(data.values, "localContent", False)
+
+---
 apiVersion: training.educates.dev/v1beta1
 kind: Workshop
 metadata:
@@ -5,12 +11,28 @@ metadata:
 spec:
   title: "Test of shared virtual cluster"
   description: "Test of using shared virtual cluster and single namespace per session."
+  publish:
+    image: $(image_repository)/labs-vcluster-testing/lab-shared-vcluster-files:$(workshop_version)
+    files:
+    - directory:
+        path: workshop
+      path: workshop
+    - directory:
+        path: ../../packages
+      path: packages
   workshop:
     files:
+    #@ if imageCaching:
     - http:
-        url: http://$(assets_repository)/workshops/lab-shared-vcluster/.tgz
+        url: http://$(assets_repository)/.tgz
+      includePaths:
+      - workshop/**
+    #@ else:
+    - image:
+        url: $(image_repository)/labs-vcluster-testing/lab-shared-vcluster-files:$(workshop_version)
       includePaths:
-      - /workshop/**
+      - workshop/**
+    #@ end
   session:
     namespaces:
       budget: medium
@@ -18,6 +40,18 @@ spec:
         token:
           enabled: false
     applications:
+      workshop:
+        enabled: true
+        #@ if localContent:
+        proxy:
+          protocol: http
+          host: localhost.$(ingress_domain)
+          port: 10081
+          changeOrigin: false
+          headers:
+          - name: X-Session-Name
+            value: $(session_name)
+        #@ end
       terminal:
         enabled: true
         layout: split
@@ -84,9 +118,16 @@ spec:
             name: vc-shared-vcluster
             key: config
         fetch:
+        #@ if imageCaching:
         - http:
             url: http://$(assets_repository)/packages/developer-namespace/.tgz
           path: packages/developer-namespace
+        #@ else:
+        - image:
+            url: $(image_repository)/labs-vcluster-testing/lab-shared-vcluster-files:$(workshop_version)
+          includePaths:
+          - packages/developer-namespace/**
+        #@ end
         template:
         - ytt:
             paths:
@@ -102,10 +143,7 @@ spec:
     assets:
       files:
       - image:
-          url: $(image_repository)/labs-vcluster-testing-files:latest
-        includePaths:
-        - /workshops/lab-shared-vcluster/**
-        - /packages/**
+          url: $(image_repository)/labs-vcluster-testing/lab-shared-vcluster-files:latest
     objects:
     - apiVersion: v1
       kind: ServiceAccount
@@ -180,9 +218,16 @@ spec:
         syncPeriod: 720h
         noopDelete: true
         fetch:
+        #@ if imageCaching:
         - http:
             url: http://$(assets_repository)/packages/cluster-credentials/.tgz
           path: packages/cluster-credentials
+        #@ else:
+        - image:
+            url: $(image_repository)/labs-vcluster-testing/lab-shared-vcluster-files:$(workshop_version)
+          includePaths:
+          - packages/cluster-credentials/**
+        #@ end
         template:
         - ytt:
             paths: