diff --git a/playbook.yml b/playbook.yml
index a345d5638cc1c0ff144eed817abc3cb34659ebfd..bc489526da8d56532af3e0310827f0e5df37debf 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -13,8 +13,9 @@
   roles:
     - kvm
     - containerlab
+    - dev_images
 
 - name: System Setup
   hosts: dev_environments
   roles:
-    - dev_network
+    - dev_networks
diff --git a/roles/containerlab/handlers/main.yml b/roles/containerlab/handlers/main.yml
index ce783235328d825c8f296dd872b6c66868f40b53..a8f490a92df93a230cc1277a6788e6682b70ed55 100644
--- a/roles/containerlab/handlers/main.yml
+++ b/roles/containerlab/handlers/main.yml
@@ -1,3 +1,3 @@
-- name: update apt cache
-  apt:
-    update_cache: yes
+- name: Update apt cache
+  ansible.builtin.apt:
+    update_cache: true
diff --git a/roles/containerlab/tasks/import_image.yml b/roles/containerlab/tasks/import_image.yml
deleted file mode 100644
index c1c5ce2dd7ebb7830cf40efb148da18844bcd11c..0000000000000000000000000000000000000000
--- a/roles/containerlab/tasks/import_image.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-- name: Inspect a single image
-  community.docker.docker_image_info:
-    name: "{{ image.image_name }}:{{ image.image_tag }}"
-  register: image_exists
-
-- name: Stop if image exists
-  ansible.builtin.meta: end_play
-  when: image_exists.images | length > 0
-
-- name: Get VM images
-  amazon.aws.aws_s3:
-    aws_access_key: "{{ s3.access_key }}"
-    aws_secret_key: "{{ s3.secret_key }}"
-    region: "{{ s3.region }}"
-    bucket: "{{ s3.bucket }}"
-    object: "{{ image.filename }}"
-    dest: "/tmp/{{ image.filename }}"
-    mode: get
-
-# - name: Add docker images
-#   community.docker.docker_image:
-#     docker_host: "unix:/run/docker.sock"
-#     name: "{{ item.image_name }}"
-#     tag: "{{ item.image_tag }}"
-#     load_path: "/tmp/{{ item.filename }}"
-#     source: load
-#     state: present
-#   loop:
-#     - filename: cEOS-lab-4.28.2.1F.tar
-#       image_name: ceos
-#       image_tag: 4.28.1.1F
-
-
-- name: Add docker images
-  # community.docker.docker_image doesn't work in this case
-  ansible.builtin.shell:
-    cmd: "docker image import /tmp/{{ image.filename }} {{ image.image_name }}:{{ image.image_tag }}"
-
-- name: Remove downloaded file
-  ansible.builtin.file:
-    path: "/tmp/{{ image.filename }}"
-    state: absent
diff --git a/roles/containerlab/tasks/main.yml b/roles/containerlab/tasks/main.yml
index 5d1dfc2b1be5a3bbd09b73a75653405120960e9d..1f93233e231fac9c87cfc228e09e309f7dc3abde 100644
--- a/roles/containerlab/tasks/main.yml
+++ b/roles/containerlab/tasks/main.yml
@@ -23,11 +23,3 @@
     groups: docker
     append: true
   with_items: "{{ users }}"
-
-- name: Create images
-  ansible.builtin.include_tasks: import_image.yml
-  loop: "{{ images }}"
-  loop_control:
-    loop_var: image
-
-
diff --git a/roles/containerlab/vars/main.yml b/roles/containerlab/vars/main.yml
index ee4b330580be70e64a634cad5478288b48583ee7..51bd403eb4fee3f8bac8ae98d1badfd0c973c5c5 100644
--- a/roles/containerlab/vars/main.yml
+++ b/roles/containerlab/vars/main.yml
@@ -11,6 +11,9 @@ images:
   - filename: cEOS-lab-4.28.2.1F.tar
     image_name: ceos
     image_tag: 4.28.1.1F
+  - filename: ubuntu-20.04.tar
+    image_name: ubuntu
+    image_tag: 20.04
 
 users:
   - nat
diff --git a/roles/dev_network/tasks/main.yml b/roles/dev_network/tasks/main.yml
deleted file mode 100644
index fe9d6a9466e2bb99267129219b923367cdd0fe58..0000000000000000000000000000000000000000
--- a/roles/dev_network/tasks/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-- name: Working directory
-  ansible.builtin.file:
-    path: ceosx2
-    state: directory
-    mode: '0755'
-
-- name: Create topology file
-  ansible.builtin.template:
-    src: ceosx2.clab.yml.j2
-    mode: '0644'
-    dest: ceosx2/ceosx2.clab.yml
-
-- name: Working directory
-  ansible.builtin.file:
-    path: vr-vmx
-    state: directory
-    mode: '0755'
-
-- name: Create topology file
-  ansible.builtin.template:
-    src: vr-vmx.clab.yml.j2
-    mode: '0644'
-    dest: vr-vmx/vr-vmx.clab.yml
diff --git a/roles/dev_network/templates/ceosx2.clab.yml.j2 b/roles/dev_network/templates/ceosx2.clab.yml.j2
deleted file mode 100644
index caf1bb07ec41af8c42af2e8f8a81a05733a72456..0000000000000000000000000000000000000000
--- a/roles/dev_network/templates/ceosx2.clab.yml.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-name: ceosx2
-
-topology:
-  nodes:
-    ceos1:
-      kind: ceos
-      image: ceos:4.28.1.1F
-    ceos2:
-      kind: ceos
-      image: ceos:4.28.1.1F
-
-  links:
-    - endpoints: ["ceos1:eth1", "ceos2:eth1"]
-
diff --git a/roles/dev_network/templates/srlceos01.clab.yml.j2 b/roles/dev_network/templates/srlceos01.clab.yml.j2
deleted file mode 100644
index 75f1be002dd443b1a116ca94bea9696b53766a78..0000000000000000000000000000000000000000
--- a/roles/dev_network/templates/srlceos01.clab.yml.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-name: srlceos01
-
-topology:
-  nodes:
-    srl:
-      kind: srl
-      image: ghcr.io/nokia/srlinux
-    ceos:
-      kind: srl
-      image: ghcr.io/nokia/srlinux
-
-  links:
-    - endpoints: ["srl:e1-1", "ceos:e1-1"]
-