diff --git a/playbook.servers.yml b/playbook.servers.yml
index 487f9390..cd0bbb79 100644
--- a/playbook.servers.yml
+++ b/playbook.servers.yml
@@ -196,11 +196,6 @@
   become: true
   roles:
    -  role: docker-bluesky
-      vars:
-        domain_api:   "{{domains.bluesky_api}}"
-        domain_web:   "{{domains.bluesky_web}}"
-        http_port_api: 8030
-        http_port_web: 8031
 
 - name: setup keycloak
   hosts: keycloak
diff --git a/roles/docker-bluesky/tasks/main.yml b/roles/docker-bluesky/tasks/main.yml
index 18007a51..13ec84c7 100644
--- a/roles/docker-bluesky/tasks/main.yml
+++ b/roles/docker-bluesky/tasks/main.yml
@@ -6,14 +6,14 @@
 - name: "Include tasks for API domain"
   include_tasks: nginx-docker-proxy-domain.yml
   vars:
-    domain: "{{ domain_api }}"
-    http_port: "{{ http_port_api }}"
+    domain: "{{ domains.bluesky_api }}"
+    http_port: "{{ ports.localhost.http_ports.bluesky_api }}"
 
 - name: "Include tasks for Web domain"
   include_tasks: nginx-docker-proxy-domain.yml
   vars:
-    domain: "{{ domain_web }}"
-    http_port: "{{ http_port_web }}" 
+    domain: "{{ domains.bluesky_web }}"
+    http_port: "{{ ports.localhost.http_ports.bluesky_web }}" 
 
 # The following lines should be removed when the following issue is closed:
 # https://github.com/bluesky-social/pds/issues/52
diff --git a/roles/docker-bluesky/templates/docker-compose.yml.j2 b/roles/docker-bluesky/templates/docker-compose.yml.j2
index bfb1bddf..1e7924a2 100644
--- a/roles/docker-bluesky/templates/docker-compose.yml.j2
+++ b/roles/docker-bluesky/templates/docker-compose.yml.j2
@@ -6,7 +6,7 @@ services:
         - pds_data:/pds
         - {{pdsadmin_file_path}}:/usr/local/bin/pdsadmin:ro
     ports:
-      - "127.0.0.1:{{http_port_api}}:3000"
+      - "127.0.0.1:{{ports.localhost.http_ports.bluesky_api}}:3000"
     healthcheck:
       test: ["CMD", "wget", "--spider", "http://127.0.0.1:3000/xrpc/_health"]
       interval: 1m
@@ -22,12 +22,12 @@ services:
       dockerfile: Dockerfile 
       # It doesn't compile yet with this parameters. @todo Fix it
       args:
-        REACT_APP_PDS_URL: "http://{{domain_api}}" # URL des PDS
-        REACT_APP_API_URL: "http://{{domain_api}}" # API-URL des PDS
+        REACT_APP_PDS_URL: "http://{{domains.bluesky_api}}" # URL des PDS
+        REACT_APP_API_URL: "http://{{domains.bluesky_api}}" # API-URL des PDS
         REACT_APP_SITE_NAME: "{{primary_domain | upper}} - Bluesky"
         REACT_APP_SITE_DESCRIPTION: "Decentral Social "
     ports:
-      - "127.0.0.1:{{http_port_web}}:8100"
+      - "127.0.0.1:{{ports.localhost.http_ports.bluesky_web}}:8100"
     healthcheck:
       test: ["CMD", "sh", "-c", "for pid in $(ls /proc | grep -E '^[0-9]+$'); do if cat /proc/$pid/cmdline 2>/dev/null | grep -q 'bskywebserve'; then exit 0; fi; done; exit 1"]
       interval: 30s