diff --git a/dockercoins/docker-compose.yml b/dockercoins/docker-compose.yml
index 83786562..4f76bb15 100644
--- a/dockercoins/docker-compose.yml
+++ b/dockercoins/docker-compose.yml
@@ -1,29 +1,29 @@
 rng:
-    build: rng
-    ports:
-      - "8001:80"
+  build: rng
+  ports:
+  - "8001:80"
 
 hasher:
-    build: hasher
-    ports:
-      - "8002:80"
+  build: hasher
+  ports:
+  - "8002:80"
 
 webui:
-    build: webui
-    links:
-      - redis
-    ports:
-      - "8000:80"
-    volumes:
-      - "./webui/files/:/files/"
+  build: webui
+  links:
+  - redis
+  ports:
+  - "8000:80"
+  volumes:
+  - "./webui/files/:/files/"
 
 redis:
-    image: redis
+  image: redis
 
 worker:
-    build: worker
-    links:
-      - rng
-      - hasher
-      - redis
+  build: worker
+  links:
+  - rng
+  - hasher
+  - redis
 
diff --git a/dockercoins/docker-compose.yml-ambassador b/dockercoins/docker-compose.yml-ambassador
index 7b9a7f0a..5ba59eed 100644
--- a/dockercoins/docker-compose.yml-ambassador
+++ b/dockercoins/docker-compose.yml-ambassador
@@ -1,43 +1,44 @@
 rng1:
-    build: rng
+  build: rng
 
 rng2:
-    build: rng
+  build: rng
 
 rng3:
-    build: rng
+  build: rng
 
 rng:
-    image: jpetazzo/hamba
-    links:
-      - rng1
-      - rng2
-      - rng3
-    command: 80 rng1 80 rng2 80 rng3 80
-    ports:
-      - "8001:80"
+  image: jpetazzo/hamba
+  links:
+  - rng1
+  - rng2
+  - rng3
+  command: 80 rng1 80 rng2 80 rng3 80
+  ports:
+  - "8001:80"
 
 hasher:
-    build: hasher
-    ports:
-      - "8002:80"
+  build: hasher
+  ports:
+  - "8002:80"
 
 webui:
-    build: webui
-    links:
-      - redis
-    ports:
-      - "8000:80"
-    volumes:
-      - "./webui/files/:/files/"
+  build: webui
+  links:
+  - redis
+  ports:
+  - "8000:80"
+  volumes:
+  - "./webui/files/:/files/"
 
 redis:
-    image: jpetazzo/hamba
-    command: 6379 AA.BB.CC.DD EEEEE
+  image: jpetazzo/hamba
+  command: 6379 AA.BB.CC.DD EEEEE
 
 worker:
-    build: worker
-    links:
-      - rng
-      - hasher
-      - redis
+  build: worker
+  links:
+  - rng
+  - hasher
+  - redis
+
diff --git a/dockercoins/docker-compose.yml-extra-hosts b/dockercoins/docker-compose.yml-extra-hosts
index 6ea98cd3..354f71cd 100644
--- a/dockercoins/docker-compose.yml-extra-hosts
+++ b/dockercoins/docker-compose.yml-extra-hosts
@@ -1,43 +1,43 @@
 rng1:
-    build: rng
+  build: rng
 
 rng2:
-    build: rng
+  build: rng
 
 rng3:
-    build: rng
+  build: rng
 
 rng0:
-    image: jpetazzo/hamba
-    links:
-      - rng1
-      - rng2
-      - rng3
-    command: 80 rng1 80 rng2 80 rng3 80
-    ports:
-      - "8001:80"
+  image: jpetazzo/hamba
+  links:
+  - rng1
+  - rng2
+  - rng3
+  command: 80 rng1 80 rng2 80 rng3 80
+  ports:
+  - "8001:80"
 
 hasher:
-    build: hasher
-    ports:
-      - "8002:80"
+  build: hasher
+  ports:
+  - "8002:80"
 
 webui:
-    build: webui
-    extra_hosts:
-      redis: A.B.C.D
-    ports:
-      - "8000:80"
-    volumes:
-      - "./webui/files/:/files/"
+  build: webui
+  extra_hosts:
+    redis: A.B.C.D
+  ports:
+  - "8000:80"
+  volumes:
+  - "./webui/files/:/files/"
 
 #redis:
 #    image: redis
 
 worker:
-    build: worker
-    links:
-      - rng0:rng
-      - hasher:hasher
-    extra_hosts:
-      redis: A.B.C.D
+  build: worker
+  links:
+  - rng0:rng
+  - hasher:hasher
+  extra_hosts:
+    redis: A.B.C.D
diff --git a/dockercoins/docker-compose.yml-logging b/dockercoins/docker-compose.yml-logging
index f1f2be3f..a6fbfd55 100644
--- a/dockercoins/docker-compose.yml-logging
+++ b/dockercoins/docker-compose.yml-logging
@@ -1,44 +1,44 @@
 rng:
-    build: rng
-    ports:
-      - "8001:80"
-    log_driver: gelf
-    log_opt:
-      gelf-address: "udp://XX.XX.XX.XX:XXXXX"
+  build: rng
+  ports:
+  - "8001:80"
+  log_driver: gelf
+  log_opt:
+    gelf-address: "udp://XX.XX.XX.XX:XXXXX"
 
 hasher:
-    build: hasher
-    ports:
-      - "8002:80"
-    log_driver: gelf
-    log_opt:
-      gelf-address: "udp://XX.XX.XX.XX:XXXXX"
+  build: hasher
+  ports:
+  - "8002:80"
+  log_driver: gelf
+  log_opt:
+    gelf-address: "udp://XX.XX.XX.XX:XXXXX"
 
 webui:
-    build: webui
-    links:
-      - redis
-    ports:
-      - "8000:80"
-    volumes:
-      - "./webui/files/:/files/"
-    log_driver: gelf
-    log_opt:
-      gelf-address: "udp://XX.XX.XX.XX:XXXXX"
+  build: webui
+  links:
+  - redis
+  ports:
+  - "8000:80"
+  volumes:
+  - "./webui/files/:/files/"
+  log_driver: gelf
+  log_opt:
+    gelf-address: "udp://XX.XX.XX.XX:XXXXX"
 
 redis:
-    image: redis
-    log_driver: gelf
-    log_opt:
-      gelf-address: "udp://XX.XX.XX.XX:XXXXX"
+  image: redis
+  log_driver: gelf
+  log_opt:
+    gelf-address: "udp://XX.XX.XX.XX:XXXXX"
 
 worker:
-    build: worker
-    links:
-      - rng
-      - hasher
-      - redis
-    log_driver: gelf
-    log_opt:
-      gelf-address: "udp://XX.XX.XX.XX:XXXXX"
+  build: worker
+  links:
+  - rng
+  - hasher
+  - redis
+  log_driver: gelf
+  log_opt:
+    gelf-address: "udp://XX.XX.XX.XX:XXXXX"
 
diff --git a/dockercoins/docker-compose.yml-scaled-rng b/dockercoins/docker-compose.yml-scaled-rng
index f1f5c9a4..46902b9e 100644
--- a/dockercoins/docker-compose.yml-scaled-rng
+++ b/dockercoins/docker-compose.yml-scaled-rng
@@ -1,43 +1,43 @@
 rng1:
-    build: rng
+  build: rng
 
 rng2:
-    build: rng
+  build: rng
 
 rng3:
-    build: rng
+  build: rng
 
 rng:
-    image: jpetazzo/hamba
-    links:
-      - rng1
-      - rng2
-      - rng3
-    command: 80 rng1 80 rng2 80 rng3 80
-    ports:
-      - "8001:80"
+  image: jpetazzo/hamba
+  links:
+  - rng1
+  - rng2
+  - rng3
+  command: 80 rng1 80 rng2 80 rng3 80
+  ports:
+  - "8001:80"
 
 hasher:
-    build: hasher
-    ports:
-      - "8002:80"
+  build: hasher
+  ports:
+  - "8002:80"
 
 webui:
-    build: webui
-    links:
-      - redis
-    ports:
-      - "8000:80"
-    volumes:
-      - "./webui/files/:/files/"
+  build: webui
+  links:
+  - redis
+  ports:
+  - "8000:80"
+  volumes:
+  - "./webui/files/:/files/"
 
 redis:
-    image: redis
+  image: redis
 
 worker:
-    build: worker
-    links:
-      - rng
-      - hasher
-      - redis
+  build: worker
+  links:
+  - rng
+  - hasher
+  - redis
 
diff --git a/dockercoins/docker-compose.yml-v2 b/dockercoins/docker-compose.yml-v2
index baea4bb2..7ef7ffae 100644
--- a/dockercoins/docker-compose.yml-v2
+++ b/dockercoins/docker-compose.yml-v2
@@ -1,23 +1,24 @@
 version: '2'
 
 services:
-    rng:
-        build: rng
-        ports:
-            - 80
+  rng:
+    build: rng
+    ports:
+    - 80
 
-    hasher:
-        build: hasher
-        ports:
-            - 80
+  hasher:
+    build: hasher
+    ports:
+    - 80
 
-    webui:
-        build: webui
-        ports:
-            - 80
+  webui:
+    build: webui
+    ports:
+    - 80
 
-    redis:
-        image: redis
+  redis:
+    image: redis
+
+  worker:
+    build: worker
 
-    worker:
-        build: worker
diff --git a/dockercoins/webui/files/index.html b/dockercoins/webui/files/index.html
index 1ebb104d..6186d998 100644
--- a/dockercoins/webui/files/index.html
+++ b/dockercoins/webui/files/index.html
@@ -50,7 +50,7 @@ function refresh () {
             points.push({ x: s2.now, y: speed });
         }
         $("#speed").text("~" + speed.toFixed(1) + " hashes/second");
-        var msg = ("I'm attending the @docker workshop at @Stylight, "
+        var msg = ("I'm attending the @docker workshop at @praqma, "
                    + "and my #DockerCoins mining rig is crunching "
                    + speed.toFixed(1) + " hashes/second! W00T!");
         $("#tweet").attr(
diff --git a/www/docker-compose.yml b/www/docker-compose.yml
index 1869c514..ca8b6c24 100644
--- a/www/docker-compose.yml
+++ b/www/docker-compose.yml
@@ -1,6 +1,6 @@
 www:
   image: nginx
   ports:
-    - "80:80"
+    - "8080:80"
   volumes:
     - "./htdocs:/usr/share/nginx/html"
diff --git a/www/htdocs/index.html b/www/htdocs/index.html
index f738bee9..c0aa2d43 100644
--- a/www/htdocs/index.html
+++ b/www/htdocs/index.html
@@ -101,9 +101,11 @@ class: title
 
 ## Logistics
 
-- Hello! We are:
-  <br/>`jerome at docker dot com`
+- Hello! I'm `jerome at docker dot com`
+
+<!--
   <br/>`aj at soulshake dot net`
+-->
 
 <!--
 Reminder, when updating the agenda: when people are told to show
@@ -115,16 +117,16 @@ at e.g. 9am, and start at 9:30.
 
 - Agenda:
 
-  .small[
-  - 09:00-09:15 hello!
-  - 09:15-10:45 part 1
-  - 10:45-11:00 coffee break
-  - 11:00-12:30 part 2
-  - 12:30-13:45 lunch break
-  - 13:45-15:15 part 3
-  - 15:15-15:30 coffee break
-  - 15:30-17:00 part 4
-  ]
+.small[
+- 09:00-09:15 hello!
+- 09:15-10:45 part 1
+- 10:45-11:00 coffee break
+- 11:00-12:30 part 2
+- 12:30-13:45 lunch break
+- 13:45-15:15 part 3
+- 15:15-15:30 coffee break
+- 15:30-17:00 part 4
+]
 
 <!-- - This will be FAST PACED, but DON'T PANIC! -->
 
@@ -139,7 +141,7 @@ Remember to change:
 -->
 
 - Experimental chat support on
-  [Gitter](https://gitter.im/jpetazzo/workshop-20160322-munchen)
+  [Gitter](https://gitter.im/jpetazzo/workshop-20160405-stockholm)
 
 ---
 
@@ -153,10 +155,9 @@ grep '^# ' index.html | grep -v '<br' | tr '#' '-'^C
 - Pre-requirements
 - VM environment
 - Our sample application
-- Running services independently
-- Running the whole app on a single node
+- Running the application
+- Container port mapping
 - Identifying bottlenecks
-- Measuring latency under load
 - Scaling HTTP on a single node
 - Put a load balancer on it
 - Connecting to containers on other hosts
@@ -169,6 +170,8 @@ grep '^# ' index.html | grep -v '<br' | tr '#' '-'^C
 
 - Docker for ops
 - Backups
+- Docker events stream
+- Attaching labels
 - Logs
 - Storing container logs in an ELK stack
 - Security upgrades
@@ -187,12 +190,14 @@ grep '^# ' index.html | grep -v '<br' | tr '#' '-'^C
 - Setting up Consul and overlay networks
 - Multi-host networking
 - Using overlay networks with Compose
+- Load balancing with overlay networks
 
 ---
 
 ## Outline (4/4)
 
 - Here be dragons
+- Distributing Machine credentials
 - Highly available Swarm managers
 - Highly available containers
 - Conclusions
@@ -239,7 +244,7 @@ grep '^# ' index.html | grep -v '<br' | tr '#' '-'^C
 - This is the stuff you're supposed to do!
 - Go to [container.training](http://container.training/) to view these slides
 - Join the chat room on
-  [Gitter](https://gitter.im/jpetazzo/workshop-20160322-munchen)
+  [Gitter](https://gitter.im/jpetazzo/workshop-20160405-stockholm)
 
 ]
 
@@ -299,13 +304,13 @@ If you want to use screen or whatever, you're welcome!
 
 ## Brand new versions!
 
-- Engine 1.10.**3**
+- Engine 1.11-rc3
 
-- Compose 1.6.2
+- Compose 1.7-rc1
 
-- Swarm 1.1.3
+- Swarm 1.2-rc1
 
-- Machine 0.6.0
+- Machine 0.7-rc1
 
 ---
 
@@ -358,8 +363,6 @@ class: pic
   - `redis` is also updated every second to track speed
   - you can see the progress with the `webui`
 
-Next: we will inspect components independently.
-
 ---
 
 # Running the application
@@ -451,7 +454,7 @@ and displays aggregated logs.
 
   - the worker doesn't update the counter after every loop, but up to once per second
 
-  - the speed is computed by the browser, looking at the counter up to once per second
+  - the speed is computed by the browser, checking the counter up to once per second
 
   - between two consecutive updates, the counter will increase either by 4, or by 0
 
@@ -521,6 +524,40 @@ Tip: use `^S` and `^Q` to pause/resume log output.
 
 ]
 
+We will let Compose stream the logs,
+and open a new terminal.
+
+<!--
+```
+&
+```
+-->
+
+---
+
+## Compose file location
+
+- What happens if you try to run Compose in `$HOME`?
+
+--
+
+- Compose complains that it cannot find `docker-compose.yml`
+
+- You need to go to the directory containing `docker-compose.yml`
+
+  - or use the `-f` option to give the path to the Compose file
+
+  - or set the `COMPOSE_FILE` environment variable
+
+.exercise[
+
+- Go to the application directory:
+  ```bash
+  cd ~/orchestration-workshop/dockercoins
+  ```
+
+]
+
 ---
 
 ## Locating port numbers for `rng` and `hasher`
@@ -587,14 +624,6 @@ Let's get random bytes of data!
 
 .exercise[
 
-- Open a new terminal and connect to the same VM
-
-<!--
-```
-NEW-TERM
-```
--->
-
 - Check that the service is alive:
   <br/>`curl localhost:8001`
 
@@ -2331,7 +2360,7 @@ in the output.
 
   - host
   - container_name
-  - short_message
+  - message
 
 ]