diff --git a/playbooks/initialize.yml b/playbooks/initialize.yml
index 9becaa9..ccbfc9c 100644
--- a/playbooks/initialize.yml
+++ b/playbooks/initialize.yml
@@ -13,6 +13,8 @@
         update: true
         exclude: [] # Override the default kernel exclusion
         clean: true
+    - role: sshd
+    - role: networkd
   tasks:
     - name: Set hostname
       become: true
@@ -24,11 +26,3 @@
         src: bashrc.sh
         dest: /etc/profile.d/ZA-enpn-bashrc.sh
         mode: 0644
-
-- name: Configure services
-  hosts: all:!network
-  tags:
-    - initialize
-  roles:
-    - role: sshd
-    - role: networkd
diff --git a/roles/datastore/tasks/main.yml b/roles/datastore/tasks/main.yml
deleted file mode 100644
index 2841584..0000000
--- a/roles/datastore/tasks/main.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- name: Configure firewall for NFS
-  become: true
-  firewalld:
-    immediate: yes
-    permenant: yes
-    service: nfs
-    state: enabled
-    zone: public
-
-- name: Install NFS
-  become: true
-  when: ansible_distribution == "CentOS"
-  yum:
-    name: nfs-utils
-    state: latest
-
-- name: Enable NFS server
-  become: true
-  service:
-    name: nfs-server
-    enabled: true
-    state: started
-
-- name: Create exports directory
-  become: true
-  file:
-    path: /share
-    state: directory
-
-- name: Symlink shares to exports directory
-  become: true
-  file:
-    dest: /share/{{ item.name }}
-    src: {{ item.path }}
-    state: link
-
-- name: Modify /etc/exports
-  become: true
-  lineinfile:
-    path: /etc/exports
-    backup: yes
-    create: true
-    state: present
-    line: "/share/{{ item.name }} {{ item.access }}({{ item.permissions }})"
diff --git a/roles/docker_host/tasks/main.yml b/roles/docker_host/tasks/main.yml
deleted file mode 100644
index ed97d53..0000000
--- a/roles/docker_host/tasks/main.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/roles/hypervisor/tasks/main.yml b/roles/hypervisor/tasks/main.yml
deleted file mode 100644
index 7a84c3c..0000000
--- a/roles/hypervisor/tasks/main.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-- name: Check system compatibility
-  when: ansible_distribution != "CentOS" and ansible_distribution != "Red Hat Enterprise Linux"
-  meta: end_play
-  debug:
-    msg: "Hypervisor deployment is only supported on CentOS and RHEL"
-
-- name: Temporarily disable IUS and EPEL repositories
-  become: true
-  command: mv /etc/yum.repos.d/{{ item }}.repo /etc/yum.repos.d/{{ item }}.repo.bak
-  with_items:
-    - ius
-    - epel
-
-- name: Install OVirt repository
-  become: true
-  yum:
-    name: http://resources.ovirt.org/pub/yum-repo/ovirt-release42.rpm
-    state: latest
-
-- name: Install OVirt Engine
-  become: true
-  yum:
-    name: ovirt-engine
-    state: latest
-
-- name: Re-enable IUS and EPEL repositories
-  become: true
-  command: mv /etc/yum.repos.d/{{ item }}.repo.bak /etc/yum.repos.d/{{ item }}.repo
-  with_items:
-    - ius
-    - epel