diff --git a/workshops/lab-installing-educates/resources/workshop.yaml b/workshops/lab-installing-educates/resources/workshop.yaml
index 914af22..d329cb8 100644
--- a/workshops/lab-installing-educates/resources/workshop.yaml
+++ b/workshops/lab-installing-educates/resources/workshop.yaml
@@ -6,11 +6,11 @@ spec:
   title: "Installing Educates"
   description: "Overview of installing Educates using the CLI."
   publish:
-    image: "$(image_repository)/lab-installing-educates-files:$(workshop_version)"
+    image: $(image_repository)/labs-educates-showcase/lab-installing-educates-files:$(workshop_version)
   workshop:
     files:
     - image:
-        url: "$(image_repository)/lab-installing-educates-files:$(workshop_version)"
+        url: "$(image_repository)/labs-educates-showcase/lab-installing-educates-files:$(workshop_version)"
       includePaths:
       - /workshop/**
       - /exercises/**
diff --git a/workshops/lab-multiple-clusters/resources/workshop.yaml b/workshops/lab-multiple-clusters/resources/workshop.yaml
index dafa42a..2eacf1f 100644
--- a/workshops/lab-multiple-clusters/resources/workshop.yaml
+++ b/workshops/lab-multiple-clusters/resources/workshop.yaml
@@ -5,14 +5,16 @@ metadata:
 spec:
   title: "Multiple Clusters"
   description: "Overview of working with multiple clusters."
+  duration: 30m
+  publish:
+    image: $(image_repository)/labs-educates-showcase/lab-multiple-clusters-files:$(workshop_version)
   workshop:
     files:
     - image:
-        url: "$(image_repository)/labs-educates-showcase-files:latest"
+        url: "$(image_repository)/labs-educates-showcase/lab-multiple-clusters-files:$(workshop_version)"
       includePaths:
-        - /workshops/lab-multiple-clusters/resources/**
-        - /workshops/lab-multiple-clusters/workshop/**
-      newRootPath: workshops/lab-multiple-clusters
+        - /resources/**
+        - /workshop/**
     - http:
         url: https://github.com/loft-sh/vcluster/releases/download/v0.14.2/vcluster-linux-amd64
       path: bin
diff --git a/workshops/lab-workshop-authoring/resources/workshop.yaml b/workshops/lab-workshop-authoring/resources/workshop.yaml
index 2524a30..74a7699 100644
--- a/workshops/lab-workshop-authoring/resources/workshop.yaml
+++ b/workshops/lab-workshop-authoring/resources/workshop.yaml
@@ -6,11 +6,11 @@ spec:
   title: "Workshop Authoring"
   description: "Overview of authoring workshops for Educates."
   publish:
-    image: "$(image_repository)/lab-workshop-authoring-files:$(workshop_version)"
+    image: $(image_repository)/labs-educates-showcase/lab-workshop-authoring-files:$(workshop_version)
   workshop:
     files:
     - image:
-        url: "$(image_repository)/lab-workshop-authoring-files:$(workshop_version)"
+        url: "$(image_repository)/labs-educates-showcase/lab-workshop-authoring-files:$(workshop_version)"
       includePaths:
       - /workshop/**
       - /exercises/**