diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 77e4af1..05fdfd9 100755
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -18,7 +18,10 @@
           - python3-dev
         state: present
         update_cache: true
-
+      register: install_docker_deps
+      until: install_docker_deps is succeeded
+      retries: 10
+      delay: 10
 
     - name: Get keys for raspotify
       ansible.builtin.command:
@@ -211,6 +214,7 @@
         path: /etc/systemd/system/docker.service.d/
         state: directory
         mode: '0755'
+
     - name: Create a directory for certs
       ansible.builtin.file:
         path: /etc/docker/certs
@@ -277,10 +281,14 @@
         path: /etc/docker/certs/ca.pem
       register: file_check
 
+    - name: Print file check result
+      ansible.builtin.debug:
+        var: file_check
+
     - name: Include role only if missing
       ansible.builtin.include_role:
         name: cert_gen
-      when: not file_check
+      when: not file_check.stat.exists and mode == "cert"
 
 
     - name: Create docker config file
@@ -293,12 +301,7 @@
               "max-size": "10m",
               "max-file": "3"
             },
-            "storage-driver": "overlay2",
-            "storage-opts": [
-              "overlay2.override_kernel_check=true"
-            ],
-            "data-root": "/var/lib/docker"
-            {
+            "data-root": "/var/lib/docker",
             "dns": ["192.168.77.101", "192.168.77.106", "8.8.8.8"],
             "dns-search": ["lan", "home.lan"]
 
diff --git a/roles/nfs_server/tasks/main.yml b/roles/nfs_server/tasks/main.yml
index 11ad828..9a0fea1 100755
--- a/roles/nfs_server/tasks/main.yml
+++ b/roles/nfs_server/tasks/main.yml
@@ -66,26 +66,26 @@
       ansible.builtin.lineinfile:
         path: /etc/exports
         regexp: "^/srv/nfs .*"
-        line: "/srv/nfs         192.168.77.0/24(rw,sync,no_subtree_check,crossmnt,fsid=0)"
+        line: "/srv/nfs         192.168.77.0/24(rw,sync,no_subtree_check,crossmnt,fsid=0) 192.168.80.0/24(rw,sync,no_subtree_check,crossmnt,fsid=0)"
 
     - name: Reconfigure nfs exports
       ansible.builtin.lineinfile:
         path: /etc/exports
         regexp: "^/srv/nfs/docker_data .*"
-        line: "/srv/nfs/docker_data 192.168.77.0/24(rw,sync,no_subtree_check)"
+        line: "/srv/nfs/docker_data 192.168.77.0/24(rw,sync,no_subtree_check) 192.168.80.0/24(rw,sync,no_subtree_check)"
       when: inventory_hostname != 'amd.home.lan'
 
     - name: Reconfigure nfs exports
       ansible.builtin.lineinfile:
         path: /etc/exports
         regexp: "^/srv/nfs/downloads .*"
-        line: "/srv/nfs/downloads 192.168.77.0/24(rw,sync,no_subtree_check)"
+        line: "/srv/nfs/downloads 192.168.77.0/24(rw,sync,no_subtree_check) 192.168.80.0/24(rw,sync,no_subtree_check)"
       when: inventory_hostname == 'm-server.home.lan'
     - name: Reconfigure nfs exports
       ansible.builtin.lineinfile:
         path: /etc/exports
         regexp: "^/srv/nfs/backup .*"
-        line: "/srv/nfs/backup 192.168.77.0/24(rw,sync,no_subtree_check)"
+        line: "/srv/nfs/backup 192.168.77.0/24(rw,sync,no_subtree_check) 192.168.80.0/24(rw,sync,no_subtree_check)"
       when: inventory_hostname == 'amd.home.lan'
     - name: Restart nfs service
       ansible.builtin.service: