diff --git a/TODO b/TODO
index 246748a..83afa8d 100644
--- a/TODO
+++ b/TODO
@@ -2,5 +2,4 @@ Docker
 Redis
 Mysql
 
-integration into wpconf
-wordpress download and config
\ No newline at end of file
+integration into wpconf
\ No newline at end of file
diff --git a/roles/install-docker/tasks/main.yml b/roles/install-docker/tasks/main.yml
new file mode 100644
index 0000000..1927732
--- /dev/null
+++ b/roles/install-docker/tasks/main.yml
@@ -0,0 +1,31 @@
+---
+- name: Install Docker prerequisites
+  become: true
+  apt:
+    pkg:
+    - gnupg
+    - curl
+
+- name: Prepare keyring folder
+  become: true
+  file:
+    path: /etc/apt/keyrings
+    state: directory
+    mode: '0744'
+
+- name: Get keyring
+  become: true
+  shell: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+
+- name: Add repository
+  become: true
+  shell: echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-pluginsudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-pluginlinux/ubuntu   $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+- name: Update repository and install docker
+  apt:
+    pkg:
+    - docker-ce
+    - docker-ce-cli
+    - containerd.io
+    - docker-compose-plugin
+    update_cache: yes
\ No newline at end of file
diff --git a/roles/install-wordpress/main.yml b/roles/install-wordpress/tasks/main.yml
similarity index 66%
rename from roles/install-wordpress/main.yml
rename to roles/install-wordpress/tasks/main.yml
index 04e6944..b602b8c 100644
--- a/roles/install-wordpress/main.yml
+++ b/roles/install-wordpress/tasks/main.yml
@@ -14,4 +14,11 @@
 - name: Delete the wordpress zip
   file:
     state: absent
-    path: /var/www/{{ vhost_name }}/latest.zip
\ No newline at end of file
+    path: /var/www/{{ vhost_name }}/latest.zip
+
+- name: Setup permissions
+  file:
+    path: /var/www/{{ vhost_name }}
+    owner: www-data
+    group: www-data
+    mode: '0644'
\ No newline at end of file
diff --git a/setup_server.yml b/setup_server.yml
index fbf49e4..3119c5c 100644
--- a/setup_server.yml
+++ b/setup_server.yml
@@ -11,4 +11,5 @@
     - role: configure-nginx
     - role: install-php
     - role: configure-php
-    - role: install-wordpress
\ No newline at end of file
+    - role: install-wordpress
+    - role: install-docker
\ No newline at end of file