diff --git a/roles/container/tasks/main.yml b/roles/container/tasks/main.yml
index fcd44b6..151006c 100644
--- a/roles/container/tasks/main.yml
+++ b/roles/container/tasks/main.yml
@@ -3,16 +3,16 @@
 - name: Container role initialization
   import_tasks: init.yml
 
-- name: Docker network {{ docker_service_name }}
-  docker_network:
-    name: "{{ docker_service_name }}"
-  when: docker_network_mode is not defined or docker_network_mode != 'host'
- 
-- name: Set networks variable
-  set_fact:
-    container_networks:
-      - name: "{{ docker_service_name }}"
-  when: docker_network_mode is not defined or docker_network_mode != 'host'
+- name: Docker network
+  when: docker_network_mode is not defined or docker_network_mode != 'host' or docker_networks | length > 0
+  block:
+    - name: Set networks variable
+      set_fact:
+        container_networks:
+          - name: "{{ docker_service_name }}"
+    - name: Docker network {{ docker_service_name }}
+      docker_network:
+        name: "{{ container_networks[0].name }}"
 
 - name: Reverse proxy for container
   include_tasks: proxy.yml
@@ -20,7 +20,7 @@
 
 - name: Database container
   include_tasks: database.yml
-  when: docker_database is defined
+  when: docker_database != 'none'
 
 - name: Additional services
   when: docker_additional_services is defined
@@ -56,7 +56,7 @@
   docker_container:
     name: "{{ docker_service_name }}"
     image: "{{ container_image.image.Id }}"
-    user: "{{ docker_user | default(omit) }}"
+    user: "{{ docker_user if docker_host_user else omit }}"
     mounts: "{{ docker_volume_definition }}"
     published_ports: "{{ container_published_ports + docker_published_ports }}"
     labels: "{{ traefik_labels | default(omit) }}"
diff --git a/roles/container/vars/main.yml b/roles/container/vars/main.yml
index 08cf00f..095e53a 100644
--- a/roles/container/vars/main.yml
+++ b/roles/container/vars/main.yml
@@ -6,6 +6,9 @@ reverse_proxy_type: caddy
 docker_proxy_target_protocol: http
 
 docker_additional_env: {}
+docker_database: none
 docker_volumes: []
+docker_networks: []
+docker_env: {}
 
 docker_published_ports: []