diff --git a/roles/docker-akaunting/vars/main.yml b/roles/docker-akaunting/vars/main.yml
index bca7ceff..93c204cd 100644
--- a/roles/docker-akaunting/vars/main.yml
+++ b/roles/docker-akaunting/vars/main.yml
@@ -1,5 +1,4 @@
 docker_compose_project_name:        "akaunting"
-docker_compose_file_path:           "{{docker_compose_instance_directory}}docker-compose.yml"
 database_type:                      "mariadb"
 database_password:                  "{{akaunting_database_password}}"
 repository_address:                 "https://github.com/akaunting/docker.git"
diff --git a/roles/docker-attendize/vars/main.yml b/roles/docker-attendize/vars/main.yml
index 3cb4e12a..91472087 100644
--- a/roles/docker-attendize/vars/main.yml
+++ b/roles/docker-attendize/vars/main.yml
@@ -1,6 +1,5 @@
 ---
 docker_compose_project_name:        "attendize"
-docker_compose_file_path:           "{{docker_compose_instance_directory}}docker-compose.yml"
 mail_interface_domain:              "mail.{{domain}}"
 database_type:                      "mariadb"
 database_password:                  "{{attendize_database_password}}"
diff --git a/roles/docker-openproject/vars/main.yml b/roles/docker-openproject/vars/main.yml
index a663d197..766d3a50 100644
--- a/roles/docker-openproject/vars/main.yml
+++ b/roles/docker-openproject/vars/main.yml
@@ -1,7 +1,6 @@
 docker_compose_project_name:        "openproject"
 repository_directory:               "{{ path_docker_compose_instances }}{{docker_compose_project_name}}/"
 docker_compose_instance_directory:  "{{repository_directory}}compose/"
-docker_compose_file_path:           "{{docker_compose_instance_directory}}docker-compose.yml"
 database_password:                  "{{openproject_database_password}}"
 repository_address:                 "https://github.com/opf/openproject-deploy"
 database_type:                      "postgres"
diff --git a/roles/docker-taiga/tasks/main.yml b/roles/docker-taiga/tasks/main.yml
index 3961c332..29283caa 100644
--- a/roles/docker-taiga/tasks/main.yml
+++ b/roles/docker-taiga/tasks/main.yml
@@ -11,4 +11,4 @@
     detached_files: 
       - .env
       - docker-compose.yml
-      - docker-compose-init.yml
+      - docker-compose-inits.yml
diff --git a/roles/docker-taiga/templates/.env.j2 b/roles/docker-taiga/templates/.env.j2
index 8f138c5b..0589dcac 100644
--- a/roles/docker-taiga/templates/.env.j2
+++ b/roles/docker-taiga/templates/.env.j2
@@ -5,7 +5,7 @@ SUBPATH="" # it'll be appended to the TAIGA_DOMAIN (use either "" or a "/subpath
 WEBSOCKETS_SCHEME=wss  # events connection protocol (use either "ws" or "wss")
 
 # Taiga's Secret Key - Variable to provide cryptographic signing
-SECRET_KEY="{{taigaio_secret_key}}"  # Please, change it to an unpredictable value!!
+SECRET_KEY="{{taiga_secret_key}}"  # Please, change it to an unpredictable value!!
 
 # Taiga's Database settings - Variables to create the Taiga database and connect to it
 POSTGRES_USER={{database_username}}  # user to connect to PostgreSQL
diff --git a/roles/docker-taiga/templates/docker-compose-inits.yml.j2 b/roles/docker-taiga/templates/docker-compose-inits.yml.j2
index 27ee9bf9..0cf504ad 100644
--- a/roles/docker-taiga/templates/docker-compose-inits.yml.j2
+++ b/roles/docker-taiga/templates/docker-compose-inits.yml.j2
@@ -1,5 +1,3 @@
-version: "3.5"
-
 x-environment:
   &default-back-environment
   POSTGRES_DB: "{{database_name}}"
@@ -35,8 +33,9 @@ services:
     image: taigaio/taiga-back:latest
     environment: *default-back-environment
 {% include 'templates/docker/container/depends-on-just-database.yml.j2' %}
+{% include 'templates/docker/container/networks.yml.j2' %}
 
     entrypoint: "python manage.py"
     volumes: *default-back-volumes
 {% include 'templates/docker/compose/networks.yml.j2' %}
-      taiga:
\ No newline at end of file
+  taiga:
diff --git a/roles/docker-taiga/templates/docker-compose.yml.j2 b/roles/docker-taiga/templates/docker-compose.yml.j2
index 422d3780..bbb7e2d2 100644
--- a/roles/docker-taiga/templates/docker-compose.yml.j2
+++ b/roles/docker-taiga/templates/docker-compose.yml.j2
@@ -1,5 +1,3 @@
-version: "3.5"
-
 x-environment:
   &default-back-environment
   # These environment variables will be used by taiga-back and taiga-async.
@@ -154,4 +152,4 @@ services:
   events-rabbitmq-data:
 
 {% include 'templates/docker/compose/networks.yml.j2' %}
-  taiga:
\ No newline at end of file
+  taiga:
diff --git a/roles/docker-taiga/vars/main.yml b/roles/docker-taiga/vars/main.yml
index 9f2e839a..a93122fc 100644
--- a/roles/docker-taiga/vars/main.yml
+++ b/roles/docker-taiga/vars/main.yml
@@ -1,5 +1,4 @@
-docker_compose_project_name:        "taigaio"
-docker_compose_file_path:           "{{docker_compose_instance_directory}}docker-compose.yml"
+docker_compose_project_name:        "taiga"
 database_type:                      "postgres"
-database_password:                  "{{taigaio_database_password}}"
+database_password:                  "{{taiga_database_password}}"
 repository_address:                 "https://github.com/taigaio/taiga-docker"
diff --git a/tasks/update-repository-with-docker-compose.yml b/tasks/update-repository-with-docker-compose.yml
index d98fe203..f0dd951c 100644
--- a/tasks/update-repository-with-docker-compose.yml
+++ b/tasks/update-repository-with-docker-compose.yml
@@ -2,4 +2,4 @@
   include_tasks: update-repository-with-files.yml
   vars:
     detached_files: 
-      - "{{docker_compose_file_path}}"
\ No newline at end of file
+      - "docker-compose.yml"
\ No newline at end of file
diff --git a/tasks/update-repository-with-files.yml b/tasks/update-repository-with-files.yml
index f62aecf4..4c985139 100644
--- a/tasks/update-repository-with-files.yml
+++ b/tasks/update-repository-with-files.yml
@@ -16,7 +16,7 @@
 - name: pull docker repository
   git:
     repo: "{{ repository_address }}"
-    dest: "{{ repository_directory }}"
+    dest: "{{ repository_directory | default(docker_compose_instance_directory) }}"
     update: yes
   notify: docker compose project setup
   become: true