diff --git a/slides/_redirects b/slides/_redirects
index 142cc30f..b95157d1 100644
--- a/slides/_redirects
+++ b/slides/_redirects
@@ -1,4 +1,4 @@
 # Uncomment and/or edit one of the the following lines if necessary.
 #/ /kube-halfday.yml.html 200
 #/ /kube-fullday.yml.html 200
-#/ /kube-twodays.yml.html 200
+/ /kadm-twodays.yml.html 200
diff --git a/slides/k8s/bootstrap.md b/slides/k8s/bootstrap.md
index b8531dc3..ab8d3657 100644
--- a/slides/k8s/bootstrap.md
+++ b/slides/k8s/bootstrap.md
@@ -1,4 +1,4 @@
-# TLS bootstrap
+# TLS bootstrap (extra material)
 
 - kubelet needs TLS keys and certificates to communicate with the control plane
 
diff --git a/slides/k8s/operators-design.md b/slides/k8s/operators-design.md
index 9a02f2b8..fd1d30c6 100644
--- a/slides/k8s/operators-design.md
+++ b/slides/k8s/operators-design.md
@@ -1,4 +1,4 @@
-## What does it take to write an operator?
+# Designing an operator (extra material)
 
 - Writing a quick-and-dirty operator, or a POC/MVP, is easy
 
diff --git a/slides/kadm-twoday.yml b/slides/kadm-twoday.yml
index 79444599..730a11f6 100644
--- a/slides/kadm-twoday.yml
+++ b/slides/kadm-twoday.yml
@@ -4,12 +4,12 @@ title: |
   and operators
 
 #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
+chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20190610-sanjose)"
+#chat: "In person!"
 
 gitrepo: github.com/jpetazzo/container.training
 
-slides: http://container.training/
+slides: http://kadm-2019-06.container.training/
 
 exclude:
 - self-paced
@@ -59,7 +59,7 @@ chapters:
   - k8s/links.md
   - shared/thankyou.md
   - |
-    # (All content after this slide is bonus material)
+    # (All content after this is bonus material)
 # EXTRA
 - - k8s/volumes.md
   - k8s/configuration.md
diff --git a/slides/kadm-twodays.yml b/slides/kadm-twodays.yml
new file mode 100644
index 00000000..3f619c48
--- /dev/null
+++ b/slides/kadm-twodays.yml
@@ -0,0 +1,68 @@
+title: |
+  Kubernetes
+  for administrators
+  and operators
+
+#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+chat: "In person!"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://kadm-2019-06.container.training/
+
+exclude:
+- self-paced
+
+chapters:
+- shared/title.md
+- logistics.md
+- k8s/intro.md
+- shared/about-slides.md
+- shared/toc.md
+# DAY 1
+- - k8s/prereqs-admin.md
+  - k8s/architecture.md
+  - k8s/deploymentslideshow.md
+  - k8s/dmuc.md
+- - k8s/multinode.md
+  - k8s/cni.md
+- - k8s/apilb.md
+  - k8s/setup-managed.md
+  - k8s/setup-selfhosted.md
+  - k8s/cluster-upgrade.md
+  - k8s/staticpods.md
+- - k8s/cluster-backup.md
+  - k8s/cloud-controller-manager.md
+  - k8s/healthchecks.md
+  - k8s/healthchecks-more.md
+# DAY 2
+- - k8s/logs-cli.md
+  - k8s/logs-centralized.md
+  - k8s/authn-authz.md
+  - k8s/csr-api.md
+- - k8s/openid-connect.md
+  - k8s/control-plane-auth.md
+  ###- k8s/bootstrap.md
+  - k8s/netpol.md
+  - k8s/podsecuritypolicy.md
+- - k8s/resource-limits.md
+  - k8s/metrics-server.md
+  - k8s/cluster-sizing.md
+  - k8s/horizontal-pod-autoscaler.md
+- - k8s/prometheus.md
+  - k8s/extending-api.md
+  - k8s/operators.md
+  ###- k8s/operators-design.md
+# CONCLUSION
+- - k8s/lastwords-admin.md
+  - k8s/links.md
+  - shared/thankyou.md
+  - |
+    # (All content after this is bonus material)
+# EXTRA
+- - k8s/volumes.md
+  - k8s/configuration.md
+  - k8s/statefulsets.md
+  - k8s/local-persistent-volumes.md
+  - k8s/portworx.md
diff --git a/slides/logistics.md b/slides/logistics.md
index 33388a06..8aed1bc8 100644
--- a/slides/logistics.md
+++ b/slides/logistics.md
@@ -1,32 +1,16 @@
 ## Intros
 
-- This slide should be customized by the tutorial instructor(s).
-
 - Hello! We are:
 
-   - .emoji[👩🏻‍🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc)
-
-   - .emoji[👨🏾‍🎓] Stu Dent ([@...](https://twitter.com/...), University of Wakanda)
-
- <!-- .dummy[
-
    - .emoji[👷🏻‍♀️] AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
 
-   - .emoji[🚁] Alexandre ([@alexbuisine](https://twitter.com/alexbuisine), Enix SAS)
+   - .emoji[🐳] Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Tiny Shell Script LLC)
 
-   - .emoji[🐳] Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Enix SAS)
+- The workshop will run from 9am to 5pm
 
-   - .emoji[⛵] Jérémy ([@jeremygarrouste](twitter.com/jeremygarrouste), Inpiwee)
+- Lunch will be served at 12:30pm
 
-   - .emoji[🎧] Romain ([@rdegez](https://twitter.com/rdegez), Enix SAS)
-
-] -->
-
-- The workshop will run from ...
-
-- There will be a lunch break at ...
-
-  (And coffee breaks!)
+- Morning and afternoon breaks are scheduled at 10:30am and 3pm
 
 - Feel free to interrupt for questions at any time