diff --git a/ansible.cfg b/ansible.cfg
index 6057b45..a5c6422 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -19,6 +19,3 @@ ssh_args = -o ControlMaster=auto -o ControlPersist=600s -o ServerAliveInterval=6
 control_path = %(directory)s/%%h-%%r
 pipelining = True
 timeout = 10
-
-[persistent_connection]
-ssh_type = libssh
\ No newline at end of file
diff --git a/docker.yml b/docker.yml
index e701c63..1d0c86d 100644
--- a/docker.yml
+++ b/docker.yml
@@ -3,9 +3,7 @@
 
 - hosts: docker
   become: true
-  pre_tasks:
-    - name: Install pip packages for Docker
-      ansible.builtin.pip: 
-        name: "{{ pip_install_packages }}"
   roles:
+    - geerlingguy.pip
+    - geerlingguy.docker
     - jotbe.traefik-docker
\ No newline at end of file
diff --git a/group_vars/docker.yml b/group_vars/docker.yml
index 49e17de..4067055 100644
--- a/group_vars/docker.yml
+++ b/group_vars/docker.yml
@@ -1,6 +1,11 @@
-#pip_package: python3-pip
+pip_package: python3-pip
 pip_install_packages:
-  - docker
-  - docker-compose
+  - name: docker
+  - name: docker-compose
+docker_edition: "ce"
+docker_version: "19.03.5"
+docker_package: "docker-{{ docker_edition }}"
+docker_package_state: present
+docker_compose_version: "1.25.0"
 docker_users:
   - deploy
diff --git a/requirements.yml b/requirements.yml
index 4b1a76d..750669d 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,35 +1,28 @@
-collections:
-  - community.docker
+- geerlingguy.firewall
+- geerlingguy.pip
+- geerlingguy.docker
 
-roles:
-  - geerlingguy.firewall
-  - geerlingguy.pip
-  # - geerlingguy.docker
-
-  - name: jotbe.common
-    src: https://git.jotbe.io/jotbe/ansible-role-common.git
-    scm: git
-  - name: jotbe.traefik-docker
-    src: https://git.jotbe.io/jotbe/ansible-role-traefik-docker.git
-    scm: git
-  - name: jotbe.nextcloud-docker
-    version: v1.0.2
-    src: https://git.jotbe.io/jotbe/ansible-role-nextcloud-docker.git
-    scm: git
-  - name: jotbe.coturn-docker
-    src: https://git.jotbe.io/jotbe/ansible-role-coturn-docker.git
-    scm: git
-  - name: jotbe.jitsi-docker
-    version: v1.0.0
-    src: https://git.jotbe.io/jotbe/ansible-role-jitsi-docker.git
-    scm: git
-  - name: jotbe.collabora-online-docker
-    version: v1.0.0
-    src: https://git.jotbe.io/jotbe/ansible-role-collabora-online-docker.git
-    scm: git
-  - name: jotbe.onlyoffice-document-server-docker
-    src: https://git.jotbe.io/jotbe/ansible-role-onlyoffice-document-server-docker.git
-    scm: git
-  - name: jotbe.cryptpad-docker
-    src: https://git.jotbe.io/jotbe/ansible-role-cryptpad-docker.git
-    scm: git
+- name: jotbe.common
+  src: https://git.jotbe.io/jotbe/ansible-role-common.git
+  scm: git
+- name: jotbe.traefik-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-traefik-docker.git
+  scm: git
+- name: jotbe.nextcloud-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-nextcloud-docker.git
+  scm: git
+- name: jotbe.coturn-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-coturn-docker.git
+  scm: git
+- name: jotbe.jitsi-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-jitsi-docker.git
+  scm: git
+- name: jotbe.collabora-online-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-collabora-online-docker.git
+  scm: git
+- name: jotbe.onlyoffice-document-server-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-onlyoffice-document-server-docker.git
+  scm: git
+- name: jotbe.cryptpad-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-cryptpad-docker.git
+  scm: git