diff --git a/doc/tutorials/deploy.rst b/doc/tutorials/deploy.rst
index 8edf45cd92..1d3c14ab2a 100644
--- a/doc/tutorials/deploy.rst
+++ b/doc/tutorials/deploy.rst
@@ -86,11 +86,11 @@ OS Setup
   .. code-block:: sh
 
      # additions to /etc/hosts
-     10.0.1.1 scion01
-     10.0.1.2 scion02
-     10.0.1.3 scion03
-     10.0.1.4 scion04
-     10.0.1.5 scion05
+     10.0.0.1 scion01
+     10.0.0.2 scion02
+     10.0.0.3 scion03
+     10.0.0.4 scion04
+     10.0.0.5 scion05
 
 
 .. _step1:
@@ -106,8 +106,8 @@ Execute the following commands on each VM:
 .. code-block:: sh
 
    cd /tmp/
-   wget https://github.com/scionproto/scion/releases/download/v0.11.0/scion_v0.11.0_deb_amd64.tar.gz
-   tar xfz scion_v0.11.0_deb_amd64.tar.gz
+   wget https://github.com/scionproto/scion/releases/download/v0.12.0/scion_v0.12.0_deb_amd64.tar.gz
+   tar xfz scion_v0.12.0_deb_amd64.tar.gz
 
    sudo apt install ./scion*.deb
 
diff --git a/doc/tutorials/deploy/topology1.json b/doc/tutorials/deploy/topology1.json
index 9f05ed5247..22e8ad252d 100644
--- a/doc/tutorials/deploy/topology1.json
+++ b/doc/tutorials/deploy/topology1.json
@@ -20,7 +20,7 @@
       "interfaces": {
         "1": {
           "underlay": {
-            "local": ":50014",
+            "local": "scion01:50014",
             "remote": "scion04:50014"
           },
           "isd_as": "42-ffaa:1:4",
@@ -29,7 +29,7 @@
         },
         "2": {
           "underlay": {
-            "local": ":50012",
+            "local": "scion01:50012",
             "remote": "scion02:50012"
           },
           "isd_as": "42-ffaa:1:2",
@@ -38,7 +38,7 @@
         },
         "3": {
           "underlay": {
-            "local": ":50013",
+            "local": "scion01:50013",
             "remote": "scion03:50013"
           },
           "isd_as": "42-ffaa:1:3",
diff --git a/doc/tutorials/deploy/topology2.json b/doc/tutorials/deploy/topology2.json
index 6b3dda3ad1..822d198199 100644
--- a/doc/tutorials/deploy/topology2.json
+++ b/doc/tutorials/deploy/topology2.json
@@ -20,7 +20,7 @@
       "interfaces": {
         "1": {
           "underlay": {
-            "local": ":50012",
+            "local": "scion02:50012",
             "remote": "scion01:50012"
           },
           "isd_as": "42-ffaa:1:1",
@@ -29,7 +29,7 @@
         },
         "2": {
           "underlay": {
-            "local": ":50023",
+            "local": "scion02:50023",
             "remote": "scion03:50023"
           },
           "isd_as": "42-ffaa:1:3",
@@ -38,7 +38,7 @@
         },
         "3": {
           "underlay": {
-            "local": ":50025",
+            "local": "scion02:50025",
             "remote": "scion05:50025"
           },
           "isd_as": "42-ffaa:1:5",
diff --git a/doc/tutorials/deploy/topology3.json b/doc/tutorials/deploy/topology3.json
index e414c520a9..27b620da32 100644
--- a/doc/tutorials/deploy/topology3.json
+++ b/doc/tutorials/deploy/topology3.json
@@ -20,7 +20,7 @@
       "interfaces": {
         "1": {
           "underlay": {
-            "local": ":50013",
+            "local": "scion03:50013",
             "remote": "scion01:50013"
           },
           "isd_as": "42-ffaa:1:1",
@@ -29,7 +29,7 @@
         },
         "2": {
           "underlay": {
-            "local": ":50023",
+            "local": "scion03:50023",
             "remote": "scion02:50023"
           },
           "isd_as": "42-ffaa:1:2",
@@ -38,7 +38,7 @@
         },
         "3": {
           "underlay": {
-            "local": ":50034",
+            "local": "scion03:50034",
             "remote": "scion04:50034"
           },
           "isd_as": "42-ffaa:1:4",
@@ -47,7 +47,7 @@
         },
         "4": {
           "underlay": {
-            "local": ":50035",
+            "local": "scion03:50035",
             "remote": "scion05:50035"
           },
           "isd_as": "42-ffaa:1:5",
diff --git a/doc/tutorials/deploy/topology4.json b/doc/tutorials/deploy/topology4.json
index 0ae79506cb..f1c13c1ff1 100644
--- a/doc/tutorials/deploy/topology4.json
+++ b/doc/tutorials/deploy/topology4.json
@@ -18,7 +18,7 @@
       "interfaces": {
         "1": {
           "underlay": {
-            "local": ":50014",
+            "local": "scion04:50014",
             "remote": "scion01:50014"
           },
           "isd_as": "42-ffaa:1:1",
@@ -27,7 +27,7 @@
         },
         "2": {
           "underlay": {
-            "local": ":50034",
+            "local": "scion04:50034",
             "remote": "scion03:50034"
           },
           "isd_as": "42-ffaa:1:3",
diff --git a/doc/tutorials/deploy/topology5.json b/doc/tutorials/deploy/topology5.json
index f32130cfec..d9852553ad 100644
--- a/doc/tutorials/deploy/topology5.json
+++ b/doc/tutorials/deploy/topology5.json
@@ -18,7 +18,7 @@
       "interfaces": {
         "1": {
           "underlay": {
-            "local": ":50025",
+            "local": "scion05:50025",
             "remote": "scion02:50025"
           },
           "isd_as": "42-ffaa:1:2",
@@ -27,7 +27,7 @@
         },
         "2": {
           "underlay": {
-            "local": ":50035",
+            "local": "scion05:50035",
             "remote": "scion03:50035"
           },
           "isd_as": "42-ffaa:1:3",