diff --git a/tasks/docker-compose-setup.yml b/tasks/docker-compose-setup.yml
index 3d7d226..830e7a7 100644
--- a/tasks/docker-compose-setup.yml
+++ b/tasks/docker-compose-setup.yml
@@ -24,13 +24,13 @@
         mode: "0755"
         owner: "{{ item.0.environment.PUID | default('root') }}"
         group: "{{ item.0.environment.PGID | default('root') }}"
-      loop: "{{ (compose_services | selectattr('volumes', 'defined') | subelements('volumes')) }}"
+      loop: "{{ (compose_services | subelements('volumes', skip_missing=True)) }}"
       when:
         - item.1.split(':')[0] is defined
         - item.1.split(':')[0] != None
         - item.1.split(':')[0] is not search('/var/run/docker.sock')  # Ignore docker socket
         - item.1.split(':')[0] is not match('^.*?\.[^/]+$')  # Ignore file bindings
-        - item.1.split(':')[0] is not match(''^[^\/]+$')  # Ignore docker volumes
+        - item.1.split(':')[0] is not match('^[^\/]+$')  # Ignore docker volumes
         - "item.1.split(':')[0] is not search('/data')"
         - "item.1.split(':')[0] is not search('/media')"
         - "item.1.split(':')[0] is not search('/etc/localtime')"
diff --git a/tasks/docker-container-setup.yml b/tasks/docker-container-setup.yml
index ca27dc1..e1e9ae3 100644
--- a/tasks/docker-container-setup.yml
+++ b/tasks/docker-container-setup.yml
@@ -8,7 +8,7 @@
         path: "{{ item.1.split(':')[0] }}"
         owner: "{{ item.0.env.PUID | default('root') }}"
         group: "{{ item.0.env.PGID | default('root') }}"
-      loop: "{{ docker_containers | selectattr('volumes', 'defined') | subelements('volumes') | default(omit)}}"
+      loop: "{{ docker_containers | subelements('volumes', skip_missing=True) | default(omit)}}"
       loop_control:
         label: "{{ item.1.split(':')[0] }}"
       when:
@@ -16,7 +16,7 @@
         - item.1.split(':')[0] != None
         - item.1.split(':')[0] is not search('/var/run/docker.sock')  # Ignore docker socket
         - item.1.split(':')[0] is not match('^.*?\.[^/]+$')  # Ignore file bindings
-        - item.1.split(':')[0] is not match(''^[^\/]+$')  # Ignore docker volumes
+        - item.1.split(':')[0] is not match('^[^\/]+$')  # Ignore docker volumes
         - "item.1.split(':')[0] is not search('/data')"
         - "item.1.split(':')[0] is not search('/media')"
         - "item.1.split(':')[0] is not search('/etc/localtime')"