diff --git a/.cc/{{cookiecutter.__demo_slug}}/demos/{{cookiecutter.__demo_slug}}/clab/topology.clab.yml.jinja b/.cc/{{cookiecutter.__demo_slug}}/demos/{{cookiecutter.__demo_slug}}/clab/topology.clab.yml.jinja
index d1080a3..7ab9ade 100644
--- a/.cc/{{cookiecutter.__demo_slug}}/demos/{{cookiecutter.__demo_slug}}/clab/topology.clab.yml.jinja
+++ b/.cc/{{cookiecutter.__demo_slug}}/demos/{{cookiecutter.__demo_slug}}/clab/topology.clab.yml.jinja
@@ -1,3 +1,4 @@
+---
 name: {{ cookiecutter.demo_name }}
 prefix: ""
 
diff --git a/demos/clab-build-containerlab-with-ceos/clab/topology.clab.yml b/demos/clab-build-containerlab-with-ceos/clab/topology.clab.yml
index 05b0039..5a8b1b1 100644
--- a/demos/clab-build-containerlab-with-ceos/clab/topology.clab.yml
+++ b/demos/clab-build-containerlab-with-ceos/clab/topology.clab.yml
@@ -1,4 +1,4 @@
-name: Build Containerlab with cEOS
+name: build-clab-with-ceos
 prefix: ""
 
 mgmt:
diff --git a/mkdocs.yml b/mkdocs.yml
index 0576613..5f51825 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,24 +82,6 @@ markdown_extensions:
           class: mermaid
           format: !!python/name:pymdownx.superfences.fence_code_format
 
-nav:
-  - Home:
-    - How To Start: index.md
-    - Credits: credits.md
-  - CVaaS:
-    - Demo:
-      - CVaaS and AVD Demo, EVPN MLAG: cvaas-cvaas-and-avd-demo--evpn-mlag/cvaas-cvaas-and-avd-demo--evpn-mlag.md
-      - CVaaS and AVD Demo, EVPN AA: cvaas-cvaas-and-avd-demo--evpn-aa/cvaas-cvaas-and-avd-demo--evpn-aa.md
-  - AVD:
-    - Workshops:
-      # - AVD Extended Workshop: avd/workshops/avd-extended-workshop/avd-extended-workshop.md
-      - AVD Extended Workshop, Part 1: avd-avd-extended-workshop--part-1.md
-  # - cLab:
-  #   - Build Containerlab with cEOS: clab-build-containerlab-with-ceos.md
-  - Construction Area:
-    - Warning: construction-area.md
-    - Build Containerlab with cEOS: clab-build-containerlab-with-ceos.md
-
 copyright: >
   &nbsp;&#x1F36A;&nbsp;<a href="#__consent">Change cookie settings</a>
 
@@ -138,3 +120,20 @@ plugins:
   - macros:
       include_yaml:
         - gh: docs/assets/data/github.yml
+
+nav:
+  - Home:
+    - How To Start: index.md
+    - Credits: credits.md
+  - CVaaS:
+    - Demo:
+      - CVaaS and AVD Demo, EVPN MLAG: cvaas-cvaas-and-avd-demo--evpn-mlag/cvaas-cvaas-and-avd-demo--evpn-mlag.md
+      - CVaaS and AVD Demo, EVPN AA: cvaas-cvaas-and-avd-demo--evpn-aa/cvaas-cvaas-and-avd-demo--evpn-aa.md
+  - AVD:
+    - Workshops:
+      # - AVD Extended Workshop: avd/workshops/avd-extended-workshop/avd-extended-workshop.md
+      - AVD Extended Workshop, Part 1: avd-avd-extended-workshop--part-1.md
+  - cLab:
+    - Build Containerlab with cEOS: clab-build-containerlab-with-ceos.md
+  - Construction Area:
+    - Warning: construction-area.md
diff --git a/slides/clab-build-containerlab-with-ceos.md b/slides/clab-build-containerlab-with-ceos.md
index d97c731..cdecb49 100644
--- a/slides/clab-build-containerlab-with-ceos.md
+++ b/slides/clab-build-containerlab-with-ceos.md
@@ -178,7 +178,7 @@ docker run hello-world
     docker import cEOS-lab-4.30.6M.tar.xz arista/ceos:4.30.6M
     ```
 
-    > NOTE: you can also import the image with the tag latest to allow quick "upgrade" of those lab where specific version is not required: `docker tag arista/ceos:4.30.2F arista/ceos:latest`
+    > NOTE: you can also import the image with the tag latest to allow quick "upgrade" of those lab where specific version is not required: `docker tag arista/ceos:4.30.6M arista/ceos:latest`
 
 2. Confirm that the image was imported successfully:
 
@@ -417,6 +417,7 @@ To get `/` as part of an interface name you can simply use `_` (underscore) in c
   sudo ip netns exec l01 tcpdump -nni eth1_1 port 179 -vvv
   ```
 
+- You can clear BGP sessions on `l01` if it takes too long to capture keepalives: `clear ip bgp *`
 - For additional details about packet capture check [cLab documentation](https://containerlab.dev/manual/wireshark/).
 
 ```console