diff --git a/defaults/main.yml b/defaults/main.yml
index c221f0f..210a9b5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -21,10 +21,11 @@ open_asfa_db_user: 'asfadb_user'
 open_asfa_db_volume: 'asfa_pg_data'
 open_asfa_db_allowed_hosts:
   - '127.0.0.1/8'
-open_asfa_db_constraints: '[node.labels.pg_data==asfa_server_test]'
+open_asfa_db_constraints: '[node.labels.pg_data_asfa_test==asfa_server_test]'
 open_asfa_pgadmin_image: 'dpage/pgadmin4'
 open_asfa_pgadmin_data_vol: 'asfa_test_pgadmin_data'
-open_asfa_pgadmin_constraints: '[node.labels.pgadmin_data==asfa_server_test]'
+open_asfa_pgadmin_docker_host: '{{ open_asfa_db_docker_host }}'
+open_asfa_pgadmin_constraints: '[node.labels.pgadmin_data_asfa_test==asfa_server_test]'
 open_asfa_pgadmin_email: 'noreply@example.com'
 #open_asfa_pgadmin_default_pwd: 'Use a vault'
 open_asfa_pgadmin_inactivity_timeout: '1200'
diff --git a/tasks/main.yml b/tasks/main.yml
index dec87e1..fa96469 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -26,12 +26,12 @@
         hostname: '{{ open_asfa_db_docker_host }}'
         #node.labels.pg_data==asfa_server_test
         labels:
-          pg_data: 'asfa_server_test'
-          pgadmin_data: 'asfa_server_test'
+          pg_data_asfa_test: 'asfa_server_test'
+          pgadmin_data_asfa_test: 'asfa_server_test'
         labels_state: 'merge'
       when: open_asfa_db_as_container
 
-    - name: Install the docker compose file
+    - name: Install the docker compose file for postgresql and pgadmin
       template: src=open-asfa-db-docker-compose.yml.j2 dest={{ open_asfa_compose_dir }}/docker-open-asfa-stack-db-test.yml owner=root group=root mode='0400'
       when: open_asfa_db_as_container