diff --git a/labs/cloudbees-cdro-v2/content/labs/pre-reqs.md b/labs/cloudbees-cdro-v2/content/labs/02_pre-reqs.md
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/pre-reqs.md
rename to labs/cloudbees-cdro-v2/content/labs/02_pre-reqs.md
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release.md b/labs/cloudbees-cdro-v2/content/labs/03_basic-release.md
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release.md
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release.md
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/1.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/1.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/10.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/10.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/10.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/10.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/11.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/11.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/11.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/11.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/12.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/12.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/12.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/12.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/13.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/13.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/13.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/13.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/14.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/14.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/14.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/14.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/15.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/15.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/15.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/15.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/16.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/16.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/16.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/16.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/17.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/17.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/17.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/17.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/18.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/18.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/18.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/18.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/19.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/19.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/19.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/19.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/2.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/2.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/20.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/20.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/20.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/20.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/21.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/21.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/21.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/21.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/22.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/22.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/22.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/22.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/23.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/23.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/23.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/23.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/24.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/24.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/24.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/24.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/25.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/25.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/25.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/25.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/26.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/26.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/26.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/26.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/27.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/27.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/27.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/27.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/28.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/28.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/28.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/28.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/29.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/29.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/29.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/29.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/3-old.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/3-old.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/3-old.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/3-old.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/3.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/3.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/30.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/30.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/30.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/30.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/31.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/31.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/31.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/31.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/32.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/32.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/32.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/32.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/33.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/33.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/33.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/33.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/34.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/34.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/34.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/34.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/35.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/35.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/35.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/35.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/36.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/36.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/36.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/36.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/4.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/4.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/4.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/4.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/5.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/5.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/5.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/5.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/6.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/6.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/6.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/6.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/7.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/7.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/7.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/7.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/8.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/8.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/8.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/8.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/basic-release/9.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/9.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/basic-release/9.png
rename to labs/cloudbees-cdro-v2/content/labs/03_basic-release/9.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment.md b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment.md
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment.md
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment.md
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/applications-page-nav.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/applications-page-nav.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/applications-page-nav.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/applications-page-nav.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/create-new-app.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/create-new-app.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/create-new-app.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/create-new-app.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/demo-app.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/demo-app.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/demo-app.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/demo-app.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/deploy-1.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/deploy-1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/deploy-1.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/deploy-1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/deploy-2.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/deploy-2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/deploy-2.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/deploy-2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/deploy-3.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/deploy-3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/deploy-3.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/deploy-3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/deployed-app.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/deployed-app.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/deployed-app.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/deployed-app.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/environment-created.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/environment-created.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/environment-created.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/environment-created.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/fresh-app-model.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/fresh-app-model.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/fresh-app-model.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/fresh-app-model.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/low-res-img.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/low-res-img.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/low-res-img.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/low-res-img.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-application-button.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-application-button.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-application-button.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-application-button.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-application-form.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-application-form.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-application-form.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-application-form.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-environment-1.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-environment-1.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-environment-2.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-environment-2.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-environment-3.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-environment-3.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-microservice-button.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-button.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-microservice-button.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-button.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-microservice-done.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-done.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-microservice-done.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-done.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-microservice-form-1.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-microservice-form-1.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-microservice-form-2.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/microservice-deployment/new-microservice-form-2.png
rename to labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments.md b/labs/cloudbees-cdro-v2/content/labs/05_environments.md
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments.md
rename to labs/cloudbees-cdro-v2/content/labs/05_environments.md
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/app-burger-menu.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/app-burger-menu.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/app-burger-menu.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/app-burger-menu.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/click-environment.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/click-environment.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/click-environment.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/click-environment.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/env-1.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/env-1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/env-1.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/env-1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/env-2.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/env-2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/env-2.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/env-2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/env-3.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/env-3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/env-3.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/env-3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/env-4.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/env-4.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/env-4.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/env-4.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/envvars-1.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/envvars-1.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/envvars-2.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/envvars-2.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/envvars-3.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/envvars-3.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/envvars-4.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-4.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/envvars-4.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-4.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/envvars-5.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-5.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/envvars-5.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-5.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/envvars-6.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-6.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/envvars-6.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-6.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/envvars-7.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-7.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/envvars-7.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-7.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/prod-1.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/prod-1.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/prod-1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/prod-2.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/prod-2.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/prod-2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/prod-3.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/prod-3.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/prod-3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/prod-4.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-4.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/prod-4.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/prod-4.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/prod-5.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-5.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/prod-5.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/prod-5.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/prod-6.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-6.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/prod-6.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/prod-6.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/prod-7.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-7.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/prod-7.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/prod-7.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/prod-8.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-8.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/prod-8.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/prod-8.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/prod-9.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-9.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/prod-9.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/prod-9.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/rerun-1.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/rerun-1.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/rerun-2.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/rerun-2.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/rerun-3.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/rerun-3.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/rerun-4.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-4.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/rerun-4.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-4.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/environments/rerun-5.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-5.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/environments/rerun-5.png
rename to labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-5.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release.md b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release.md
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release.md
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release.md
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/1.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/1.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/10.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/10.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/10.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/10.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/11.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/11.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/11.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/11.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/12.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/12.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/12.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/12.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/13.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/13.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/13.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/13.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/14.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/14.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/14.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/14.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/15.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/15.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/15.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/15.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/16.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/16.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/16.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/16.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/17.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/17.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/17.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/17.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/18.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/18.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/18.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/18.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/19.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/19.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/19.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/19.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/2.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/2.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/20.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/20.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/20.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/20.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/21.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/21.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/21.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/21.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/22.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/22.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/22.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/22.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/23.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/23.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/23.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/23.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/24.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/24.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/24.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/24.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/25.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/25.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/25.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/25.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/26.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/26.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/26.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/26.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/27.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/27.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/27.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/27.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/28.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/28.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/28.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/28.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/29.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/29.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/29.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/29.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/3.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/3.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/4.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/4.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/4.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/4.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/5.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/5.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/5.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/5.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/6.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/6.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/6.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/6.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/7.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/7.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/7.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/7.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/8.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/8.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/8.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/8.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/deployment-in-release/9.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/9.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/deployment-in-release/9.png
rename to labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/9.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline.md b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline.md
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline.md
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline.md
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/1.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/1.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/10.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/10.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/10.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/10.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/11.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/11.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/11.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/11.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/12.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/12.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/12.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/12.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/13.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/13.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/13.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/13.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/14.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/14.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/14.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/14.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/15.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/15.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/15.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/15.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/16.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/16.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/16.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/16.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/17.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/17.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/17.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/17.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/18.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/18.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/18.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/18.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/19.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/19.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/19.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/19.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/2.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/2.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/20.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/20.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/20.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/20.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/21.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/21.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/21.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/21.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/22.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/22.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/22.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/22.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/23.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/23.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/23.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/23.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/3.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/3.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/4.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/4.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/4.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/4.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/5.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/5.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/5.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/5.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/6.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/6.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/6.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/6.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/7.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/7.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/7.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/7.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/8.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/8.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/8.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/8.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/9.png b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/9.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/template-release-as-a-pipeline/9.png
rename to labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline/9.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog.md b/labs/cloudbees-cdro-v2/content/labs/08_catalog.md
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog.md
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog.md
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/1.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/1.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/1.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/1.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/10.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/10.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/10.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/10.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/11.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/11.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/11.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/11.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/12.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/12.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/12.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/12.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/13.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/13.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/13.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/13.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/14.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/14.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/14.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/14.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/15.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/15.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/15.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/15.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/16.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/16.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/16.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/16.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/17.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/17.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/17.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/17.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/18.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/18.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/18.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/18.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/19.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/19.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/19.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/19.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/2.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/2.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/2.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/2.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/20.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/20.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/20.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/20.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/21.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/21.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/21.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/21.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/22.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/22.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/22.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/22.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/23.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/23.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/23.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/23.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/24.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/24.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/24.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/24.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/25.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/25.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/25.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/25.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/26-old.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/26-old.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/26-old.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/26-old.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/26.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/26.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/26.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/26.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/3.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/3.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/3.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/3.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/4.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/4.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/4.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/4.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/5.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/5.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/5.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/5.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/6.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/6.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/6.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/6.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/7.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/7.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/7.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/7.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/8-old.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/8-old.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/8-old.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/8-old.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/8.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/8.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/8.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/8.png
diff --git a/labs/cloudbees-cdro-v2/content/labs/catalog/9.png b/labs/cloudbees-cdro-v2/content/labs/08_catalog/9.png
similarity index 100%
rename from labs/cloudbees-cdro-v2/content/labs/catalog/9.png
rename to labs/cloudbees-cdro-v2/content/labs/08_catalog/9.png
diff --git a/labs/cloudbees-cdro-v2/support/dsl/Workshop_Service_Catalog.groovy b/labs/cloudbees-cdro-v2/support/dsl/Workshop_Service_Catalog.groovy
new file mode 100644
index 000000000..a7631ad2d
--- /dev/null
+++ b/labs/cloudbees-cdro-v2/support/dsl/Workshop_Service_Catalog.groovy
@@ -0,0 +1,68 @@
+catalog 'Workshop', {
+  projectName = 'Workshop'
+
+  catalogItem '1. Basic Release', {
+    description = '''<xml>
+  <title>
+    Create a new released based on pipeline templates
+  </title>
+
+  <htmlData>
+    <![CDATA[
+      Create a new release from existing pipeline templates
+    ]]>
+  </htmlData>
+</xml>'''
+    buttonLabel = 'Create'
+    catalogName = 'Workshop'
+    dslString = '''def StartDate = (new Date())
+def StartDateStr = (String) StartDate.format( "yyyy-MM-dd" )
+def EndDateStr = (String) (StartDate+14).format( "yyyy-MM-dd" )
+
+release args.releaseName, {
+  projectName = args.targetProject
+
+  plannedStartDate = StartDateStr
+  plannedEndDate = EndDateStr
+  
+  pipelineProjectName = "Workshop"
+  pipelineName = "Pipeline_base"
+  
+  Release_Name = args.releaseTag
+  String[] tags = args.releaseTag.replaceAll("[.]", "").split(", ");
+  for (String tagItem: tags) {
+    tag tagItem
+  }
+}'''
+    endTargetJson = '''{
+  "source": "parameter",
+  "object": "release",
+  "objectName": "releaseName",
+  "objectProjectName": "targetProject",
+  "objectId": "id"
+}'''
+    iconUrl = 'icon-pipeline.svg'
+    useFormalParameter = '1'
+
+    formalParameter 'releaseName', {
+      label = 'Release Name'
+      orderIndex = '1'
+      required = '1'
+      type = 'entry'
+    }
+
+    formalParameter 'releaseTag', {
+      label = 'Release Tags'
+      orderIndex = '2'
+      required = '1'
+      type = 'entry'
+    }
+    formalParameter 'targetProject', defaultValue: '$[/myUser/userName]', {
+      expansionDeferred = '0'
+      label = 'Target Project'
+      orderIndex = '3'
+      required = '1'
+      type = 'project'
+    }
+  }
+}
\ No newline at end of file
diff --git a/labs/cloudbees-cdro-v2/support/dsl/pipeline_Base.groovy b/labs/cloudbees-cdro-v2/support/dsl/pipeline_Base.groovy
new file mode 100644
index 000000000..a2664cab5
--- /dev/null
+++ b/labs/cloudbees-cdro-v2/support/dsl/pipeline_Base.groovy
@@ -0,0 +1,108 @@
+pipeline 'pipeline_Base', {
+  projectName = 'Workshop'
+
+  formalParameter 'ec_stagesToRun', {
+    expansionDeferred = '1'
+  }
+
+  stage 'Release Readiness', {
+    colorCode = '#289ce1'
+    pipelineName = 'pipeline_Base'
+    gate 'POST', {
+      task 'No Code Smells', {
+        gateCondition = '$[/javascript myStageRuntime.tasks[\'Get latest SonarQube scan results\'].job.getLastSonarMetrics.code_smells != null || myStageRuntime.tasks[\'Get latest SonarQube scan results\'].job.getLastSonarMetrics.code_smells < 1]'
+        gateType = 'POST'
+        subproject = 'Workshop'
+        taskType = 'CONDITIONAL'
+      }
+    }
+
+    task 'Git changelog', {
+      actualParameter = [
+        'branch': 'main',
+        'commit': '',
+        'config': '/projects/Workshop/pluginConfigurations/Git-Source-Code-Sync',
+        'depth': '',
+        'gitRepoFolder': '/tmp/demo-app',
+        'mirror': 'false',
+        'overwrite': 'true',
+        'pathspecs': '',
+        'referenceFolder': '',
+        'repoUrl': 'https://github.com/cloudbees-days/cdro-workshop-demo-app',
+        'resultPropertySheet': '/myJob/clone',
+        'shallowSubmodules': 'false',
+        'submodules': 'false',
+        'tag': '',
+      ]
+      stageSummaryParameters = '[{"label":"cloneData","name":"cloneData"}]'
+      subpluginKey = 'EC-Git'
+      subprocedure = 'Clone'
+      taskType = 'PLUGIN'
+    }
+
+    task 'Get latest SonarQube scan results', {
+      actualParameter = [
+        'config': '/projects/Workshop/pluginConfigurations/cb-demos-sonar',
+        'resultFormat': 'propertysheet',
+        'resultSonarProperty': '/myJob/getLastSonarMetrics',
+        'sonarMetricsComplexity': 'all',
+        'sonarMetricsDocumentation': 'all',
+        'sonarMetricsDuplications': 'all',
+        'sonarMetricsIssues': 'all',
+        'sonarMetricsMaintainability': 'all',
+        'sonarMetricsMetrics': 'all',
+        'sonarMetricsQualityGates': 'all',
+        'sonarMetricsReliability': 'all',
+        'sonarMetricsSecurity': 'all',
+        'sonarMetricsTests': 'all',
+        'sonarProjectKey': 'petclinic',
+        'sonarProjectName': 'petclinic',
+        'sonarProjectVersion': '2.2.0.BUILD-SNAPSHOT',
+        'sonarTaskId': '',
+        'sonarTimeout': '',
+      ]
+      subpluginKey = 'EC-SonarQube'
+      subprocedure = 'Get Last SonarQube Metrics'
+      taskType = 'PLUGIN'
+    }
+  }
+
+  stage 'Quality Assurance', {
+    colorCode = '#ff7f0e'
+    pipelineName = 'pipeline_Base'
+    task 'Deploy to QA', {
+      command = 'echo "Deploy to QA"'
+      taskType = 'COMMAND'
+    }
+  }
+
+  stage 'Production', {
+    colorCode = '#2ca02c'
+    pipelineName = 'pipeline_Base'
+    gate 'PRE', {
+      task 'Manual approval', {
+        gateType = 'PRE'
+        notificationEnabled = '1'
+        notificationTemplate = 'ec_default_gate_task_notification_template'
+        subproject = 'Workshop'
+        taskType = 'APPROVAL'
+        approver = [
+          'rbroker',
+        ]
+      }
+    }
+
+    task 'Deploy to Production', {
+      command = 'echo "Deploy to Production"'
+      taskType = 'COMMAND'
+    }
+  }
+
+  // Custom properties
+
+  property 'ec_counters', {
+
+    // Custom properties
+    pipelineCounter = '1'
+  }
+}
\ No newline at end of file