diff --git a/playbook.yaml b/docker.yaml
similarity index 54%
rename from playbook.yaml
rename to docker.yaml
index 3e73772..715cffd 100644
--- a/playbook.yaml
+++ b/docker.yaml
@@ -1,7 +1,6 @@
 ---
-- name: "Update/upgrade debian and install neovim"
-  hosts: prodservers
-  tags: debian
+- name: "Update/upgrade debian and install docker and misc tools."
+  hosts: docker
   roles:
       - system
       - softwares
diff --git a/inventory.example.yaml b/inventories/inventory.example.yaml
similarity index 100%
rename from inventory.example.yaml
rename to inventories/inventory.example.yaml
diff --git a/roles/softwares/tasks/main.yaml b/roles/softwares/tasks/main.yaml
index af803a6..5a6204e 100644
--- a/roles/softwares/tasks/main.yaml
+++ b/roles/softwares/tasks/main.yaml
@@ -10,3 +10,9 @@
     name: htop
     state: latest
     update_cache: true
+
+- name: Install net-tools (i.e. netstat)
+  ansible.builtin.apt:
+    name: net-tools
+    state: latest
+    update_cache: true
diff --git a/roles/wireguard/tasks/main.yaml b/roles/wireguard/tasks/main.yaml
new file mode 100644
index 0000000..f285f8d
--- /dev/null
+++ b/roles/wireguard/tasks/main.yaml
@@ -0,0 +1,12 @@
+---
+- name: Install wireguard
+  ansible.builtin.apt:
+    name: wireguard
+    state: latest
+    update_cache: true
+
+- name: Install wireguard tools
+  ansible.builtin.apt:
+    name: wireguard-tools
+    state: latest
+    update_cache: true
diff --git a/wireguard.yaml b/wireguard.yaml
new file mode 100644
index 0000000..1657ab4
--- /dev/null
+++ b/wireguard.yaml
@@ -0,0 +1,9 @@
+---
+- name: "Update/upgrade debian and install wireguard and misc tools."
+  hosts: wireguard
+  roles:
+      - system
+      - softwares
+      - bpytop
+      - wireguard
+      - clean