diff --git a/playbooks/deploy.yaml b/playbooks/deploy.yaml
index 600b084..badae34 100644
--- a/playbooks/deploy.yaml
+++ b/playbooks/deploy.yaml
@@ -3,13 +3,13 @@
   hosts: localhost
   gather_facts: false
   roles:
-    - ../roles/00_basic_proxmox_lxc
+    - ../roles/basic_proxmox_lxc
 
 - name: Basic Proxmox guest deployment
   hosts: all
   remote_user: root
   roles:
-    - ../roles/01_basic_postinstall
+    - ../roles/basic_postinstall
   vars_files:
     ../inventory/group_vars/all/secrets.yaml
   vars:
diff --git a/playbooks/maintain.yaml b/playbooks/maintain.yaml
index 8d0afa3..368befe 100644
--- a/playbooks/maintain.yaml
+++ b/playbooks/maintain.yaml
@@ -3,7 +3,7 @@
   hosts: all
   remote_user: ansible
   roles:
-    - ../roles/02_common_healthcheck
+    - ../roles/common_healthcheck
   vars_files:
     ../inventory/group_vars/all/secrets.yaml
   vars:
diff --git a/roles/01_basic_postinstall/files/.vimrc b/roles/basic_postinstall/files/.vimrc
similarity index 100%
rename from roles/01_basic_postinstall/files/.vimrc
rename to roles/basic_postinstall/files/.vimrc
diff --git a/roles/01_basic_postinstall/files/.zshrc b/roles/basic_postinstall/files/.zshrc
similarity index 100%
rename from roles/01_basic_postinstall/files/.zshrc
rename to roles/basic_postinstall/files/.zshrc
diff --git a/roles/01_basic_postinstall/files/hardened_ssh.conf b/roles/basic_postinstall/files/hardened_ssh.conf
similarity index 100%
rename from roles/01_basic_postinstall/files/hardened_ssh.conf
rename to roles/basic_postinstall/files/hardened_ssh.conf
diff --git a/roles/01_basic_postinstall/files/hardened_sshd.conf b/roles/basic_postinstall/files/hardened_sshd.conf
similarity index 100%
rename from roles/01_basic_postinstall/files/hardened_sshd.conf
rename to roles/basic_postinstall/files/hardened_sshd.conf
diff --git a/roles/01_basic_postinstall/files/install_omz.sh b/roles/basic_postinstall/files/install_omz.sh
similarity index 100%
rename from roles/01_basic_postinstall/files/install_omz.sh
rename to roles/basic_postinstall/files/install_omz.sh
diff --git a/roles/01_basic_postinstall/tasks/create_new_user.yaml b/roles/basic_postinstall/tasks/create_new_user.yaml
similarity index 100%
rename from roles/01_basic_postinstall/tasks/create_new_user.yaml
rename to roles/basic_postinstall/tasks/create_new_user.yaml
diff --git a/roles/01_basic_postinstall/tasks/harden_ssh.yaml b/roles/basic_postinstall/tasks/harden_ssh.yaml
similarity index 100%
rename from roles/01_basic_postinstall/tasks/harden_ssh.yaml
rename to roles/basic_postinstall/tasks/harden_ssh.yaml
diff --git a/roles/01_basic_postinstall/tasks/install_basic_utils.yaml b/roles/basic_postinstall/tasks/install_basic_utils.yaml
similarity index 100%
rename from roles/01_basic_postinstall/tasks/install_basic_utils.yaml
rename to roles/basic_postinstall/tasks/install_basic_utils.yaml
diff --git a/roles/01_basic_postinstall/tasks/main.yaml b/roles/basic_postinstall/tasks/main.yaml
similarity index 100%
rename from roles/01_basic_postinstall/tasks/main.yaml
rename to roles/basic_postinstall/tasks/main.yaml
diff --git a/roles/01_basic_postinstall/tasks/prepare_ansible_user.yaml b/roles/basic_postinstall/tasks/prepare_ansible_user.yaml
similarity index 100%
rename from roles/01_basic_postinstall/tasks/prepare_ansible_user.yaml
rename to roles/basic_postinstall/tasks/prepare_ansible_user.yaml
diff --git a/roles/01_basic_postinstall/tasks/remove_packages.yaml b/roles/basic_postinstall/tasks/remove_packages.yaml
similarity index 100%
rename from roles/01_basic_postinstall/tasks/remove_packages.yaml
rename to roles/basic_postinstall/tasks/remove_packages.yaml
diff --git a/roles/01_basic_postinstall/tasks/set_locale_and_time.yaml b/roles/basic_postinstall/tasks/set_locale_and_time.yaml
similarity index 100%
rename from roles/01_basic_postinstall/tasks/set_locale_and_time.yaml
rename to roles/basic_postinstall/tasks/set_locale_and_time.yaml
diff --git a/roles/00_basic_proxmox_lxc/tasks/main.yaml b/roles/basic_proxmox_lxc/tasks/main.yaml
similarity index 100%
rename from roles/00_basic_proxmox_lxc/tasks/main.yaml
rename to roles/basic_proxmox_lxc/tasks/main.yaml
diff --git a/roles/02_common_healthcheck/files/ca.pem b/roles/common_healthcheck/files/ca.pem
similarity index 100%
rename from roles/02_common_healthcheck/files/ca.pem
rename to roles/common_healthcheck/files/ca.pem
diff --git a/roles/02_common_healthcheck/tasks/main.yaml b/roles/common_healthcheck/tasks/main.yaml
similarity index 100%
rename from roles/02_common_healthcheck/tasks/main.yaml
rename to roles/common_healthcheck/tasks/main.yaml