diff --git a/roles/docker-taiga/templates/.env.j2 b/roles/docker-taiga/templates/.env.j2
index 0589dcac..ec9dd0e8 100644
--- a/roles/docker-taiga/templates/.env.j2
+++ b/roles/docker-taiga/templates/.env.j2
@@ -9,7 +9,7 @@ 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
-POSTGRES_PASSWORD={{peertube_database_password}}  # database user's password
+POSTGRES_PASSWORD={{database_password}}  # database user's password
 
 # Taiga's SMTP settings - Variables to send Taiga's emails to the users
 EMAIL_BACKEND       =   console                     # use an SMTP server or display the emails in the console (either "smtp" or "console")
diff --git a/roles/docker-taiga/templates/docker-compose.yml.j2 b/roles/docker-taiga/templates/docker-compose.yml.j2
index bbb7e2d2..3711fc8c 100644
--- a/roles/docker-taiga/templates/docker-compose.yml.j2
+++ b/roles/docker-taiga/templates/docker-compose.yml.j2
@@ -37,7 +37,7 @@ x-volumes:
 
 services:
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}
-  back:
+  taiga-back:
     image: taigaio/taiga-back:latest
     environment: *default-back-environment
     volumes: *default-back-volumes
@@ -80,7 +80,7 @@ services:
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
 
-  front:
+  taiga-front:
     image: taigaio/taiga-front:latest
     environment:
       TAIGA_URL: "${TAIGA_SCHEME}://${TAIGA_DOMAIN}"
@@ -93,7 +93,7 @@ services:
     # volumes:
     #   - ./conf.json:/usr/share/nginx/html/conf.json
 
-  events:
+  taiga-events:
     image: taigaio/taiga-events:latest
     environment:
       RABBITMQ_USER: "${RABBITMQ_USER}"
@@ -141,9 +141,9 @@ services:
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
     depends_on:
-      - front
-      - back
-      - events
+      - taiga-front
+      - taiga-back
+      - taiga-events
 
 {% include 'templates/docker/compose/volumes.yml.j2' %}
   static-data: