diff --git a/ansible/inventory/runa.yml b/ansible/inventory/runa.yml
index 9559f96..0a83dca 100644
--- a/ansible/inventory/runa.yml
+++ b/ansible/inventory/runa.yml
@@ -9,7 +9,6 @@ runa:
       - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9P5aA5O4Vsgg5sB6Ojk+z1f5F97hvwRRd3gi+a+GGq nico-2016"
       - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCjWYALKYHTs6mX7GrrpxR0TPhxwVplmmcTPAA7zjhVCZajcUwLduy3Yct4YXBwRiEydGyhExoVVB8i7UhyvMQsTheRk751uJZyKWIkqbQJoJx1LPmZ00EJNaiIEiJih762D9KWZ1GoLBfB4QAEmoWDzVm3CFJ9tBVEsQ7i9BH+Cbe2GsnqflfWjb09bZhaOSTrmWNcBxgpXirZyi8EI0SrVtmnwVzdH8HXOalvFqW57aY1q/RjE1DIh7Pp+RiGscZz6CJ5oJtSEKbjZ2aUe4gomlQwYmGNVk22RdjvB7+0KDXMwdp702Z5ETv2xYk9v5YrA/lsWk/9JX8vGYb5Y5N+GGG9woZ5M1JIRjXduxNf68VMSQbxZTeonoWkh6Q8CNgDsHyyAyNuPAss7SCCGk5G8s0q/4IDGfV0A1QKFhHOId1qEqGQtLKaRbo6ZTi9wXSieA5D3kMNh+WWufutxI/t56USzNSaeYjqpYwiICBZ8jzWBJrDamiFne4KkW3PTao7Czv6yIeXHHfGYDtdvXppMSjamw+rbA/btTes5X+pYlFxniO5sZJUa+jnJOo3SYBGoRYftqxw7Usqm/i/koHP1RM8L3Iq+/xXNr5+AyFzRBCUUuDfRw1MY1n9OJXvYykNGth4ablfVFcP1R8Qq7jVGksK1dzckzD9SmCdubzwtw== nico-2014"
 
-    matrix_service: ""
     logs_dirs:
       - name: nginx
         uid: 101
@@ -34,7 +33,6 @@ runa:
         mtx-elem-2.lat.internal.ru.com:
           docker_compose:
             - elementweb
-          matrix_service: "elementweb"
         mtx-syna-1.lat.internal.ru.com:
           docker_compose:
             - synapse
diff --git a/ansible/playbook/runa.yml b/ansible/playbook/runa.yml
index c9b2cfd..ab31b95 100644
--- a/ansible/playbook/runa.yml
+++ b/ansible/playbook/runa.yml
@@ -11,7 +11,6 @@
         name: synapse-base
       tags:
         - synapse
-        - logdir
       when: '"synapse" in docker_compose'
     - name: SSL Certs
       include_role:
@@ -25,10 +24,3 @@
       tags:
         - docker
       when: docker_compose
-    - name: Add elementweb
-      include_role:
-        name: elementweb
-      tags:
-        - docker
-        - test
-      when: matrix_service == "elementweb"
diff --git a/ansible/roles/elementweb/files/basedir/.env b/ansible/roles/docker-compose/files/elementweb/.env
similarity index 100%
rename from ansible/roles/elementweb/files/basedir/.env
rename to ansible/roles/docker-compose/files/elementweb/.env
diff --git a/ansible/roles/elementweb/files/basedir/config.json b/ansible/roles/docker-compose/files/elementweb/config.json
similarity index 100%
rename from ansible/roles/elementweb/files/basedir/config.json
rename to ansible/roles/docker-compose/files/elementweb/config.json
diff --git a/ansible/roles/elementweb/files/docker-compose.yaml b/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml
similarity index 100%
rename from ansible/roles/elementweb/files/docker-compose.yaml
rename to ansible/roles/docker-compose/files/elementweb/docker-compose.yaml
diff --git a/ansible/roles/elementweb/templates/nginx/elementweb.conf b/ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf
similarity index 68%
rename from ansible/roles/elementweb/templates/nginx/elementweb.conf
rename to ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf
index c1923d3..2370b4d 100644
--- a/ansible/roles/elementweb/templates/nginx/elementweb.conf
+++ b/ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf
@@ -6,11 +6,6 @@ server {
     ssl_certificate      /ssl/chain.crt;
     ssl_certificate_key  /ssl/certificate.keyplain;
 
-    access_log /var/log/nginx/element/access-{{ inventory_hostname }}.log main;
-    access_log /var/log/nginx/access-{{ inventory_hostname }}.log main;
-    error_log /var/log/nginx/element/error-{{ inventory_hostname }}.log notice;
-    error_log /var/log/nginx/error-{{ inventory_hostname }}.log notice;
-
     error_page 403 404 /403_404.html;
     location = /403_404.html {
 	    default_type application/json;
diff --git a/ansible/roles/elementweb/files/www/index.html b/ansible/roles/docker-compose/files/elementweb/www/index.html
similarity index 100%
rename from ansible/roles/elementweb/files/www/index.html
rename to ansible/roles/docker-compose/files/elementweb/www/index.html
diff --git a/ansible/roles/docker-compose/tasks/main.yml b/ansible/roles/docker-compose/tasks/main.yml
index cc33bf5..5e9cd6d 100644
--- a/ansible/roles/docker-compose/tasks/main.yml
+++ b/ansible/roles/docker-compose/tasks/main.yml
@@ -93,7 +93,6 @@
   loop: "{{ docker_compose }}"
   tags:
     - dir
-
 - name: Copy docker-compose contents
   ansible.builtin.copy:
     src: files/{{ item }}/
diff --git a/ansible/roles/elementweb/tasks/main.yml b/ansible/roles/elementweb/tasks/main.yml
deleted file mode 100644
index 2f88241..0000000
--- a/ansible/roles/elementweb/tasks/main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- name: Copy docker-compose contents
-  ansible.builtin.copy:
-    src: files/basedir/
-    dest: /home/{{ ansible_user }}/docker_compose/{{ docker_compose }}
-    owner: "{{ ansible_user }}"
-    mode: '0644'
-  tags:
-    - files
-    - test
-
-- name: Create nginx dir
-  ansible.builtin.file:
-    path: /home/{{ ansible_user }}/docker_compose/nginx
-    state: directory
-    owner: "{{ ansible_user }}"
-    mode: '0755'
-  tags:
-    - dir
-    - test
-
-- name: Create nginx config
-  ansible.builtin.template:
-    src: "nginx/elementweb.conf"
-    dest: /home/{{ ansible_user }}/docker_compose/nginx/elementweb.conf
-    owner: "{{ ansible_user }}"
-    mode: '0644'
-  tags:
-    - test
diff --git a/ansible/roles/synapse-base/tasks/main.yml b/ansible/roles/synapse-base/tasks/main.yml
index 63b5fac..4d05f76 100644
--- a/ansible/roles/synapse-base/tasks/main.yml
+++ b/ansible/roles/synapse-base/tasks/main.yml
@@ -12,22 +12,11 @@
     owner: 991
   tags:
     - directory
-- name: Create logging base directory
-  ansible.builtin.file:
-    path: /mnt/logs/
-    state: directory
-    mode: '0755'
-    owner: "root"
-  tags:
-    - dir
-    - logdir
-- name: Create logging directory
-  ansible.builtin.file:
-    path: /mnt/logs/{{ item.name }}
-    state: directory
-    mode: '0755'
-    owner: "{{ item.uid }}"
-  tags:
-    - dir
-    - logdir
-  loop: "{{ logs_dirs }}"
+# - name: Create homeserver.yaml file
+#   ansible.builtin.copy:
+#     src: files/homeserver.yaml
+#     dest: /mnt/synapse_data/homeserver.yaml
+#     owner: "{{ ansible_user }}"
+#     mode: '0600'
+#   tags:
+#     - files