diff --git a/roles/containerlab/tasks/main.yml b/roles/containerlab/tasks/main.yml
index 1f93233e231fac9c87cfc228e09e309f7dc3abde..4d301b581ab5286602952ce1558792cc9c5e8222 100644
--- a/roles/containerlab/tasks/main.yml
+++ b/roles/containerlab/tasks/main.yml
@@ -19,7 +19,6 @@
 
 - name: Add relevant users to docker group
   ansible.builtin.user:
-    name: "{{ item }}"
+    name: "{{ nat_user }}"
     groups: docker
     append: true
-  with_items: "{{ users }}"
diff --git a/roles/containerlab/vars/main.yml b/roles/containerlab/vars/main.yml
deleted file mode 100644
index 51bd403eb4fee3f8bac8ae98d1badfd0c973c5c5..0000000000000000000000000000000000000000
--- a/roles/containerlab/vars/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-s3:
-  access_key: AKIA6DQFYS5WRMJU4FW6
-  secret_key: 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
-  region: eu-west-3
-  bucket: geant-emulation-images
-
-images:
-  - filename: vrnetlab-vr-vmx-18.2R1.9.tar
-    image_name: vrnetlab/vr-vmx
-    image_tag: 18.2R1.9
-  - 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_images/tasks/main.yml b/roles/dev_images/tasks/main.yml
index 5d1180ef47c051a77ff12a614d2aca862c0c4b53..d878dba823f807077bfba5ac2f164f1819509549 100644
--- a/roles/dev_images/tasks/main.yml
+++ b/roles/dev_images/tasks/main.yml
@@ -10,11 +10,11 @@
     version: v0.8.1
     dest: $HOME/vrnetlab
 
-- name: Build vrnetlab images
-  ansible.builtin.include_tasks: build_image.yml
-  loop: "{{ vrnetlab_images }}"
-  loop_control:
-    loop_var: image
+# - name: Build vrnetlab images
+#   ansible.builtin.include_tasks: build_image.yml
+#   loop: "{{ vrnetlab_images }}"
+#   loop_control:
+#     loop_var: image
 
 - name: Import normal images
   ansible.builtin.include_tasks: import_image.yml