diff --git a/compose/assets/vomsaa/application-mysql-test.yml b/compose/assets/vomsaa/application-mysql-test.yml
index ca62a23..cd66e5d 100644
--- a/compose/assets/vomsaa/application-mysql-test.yml
+++ b/compose/assets/vomsaa/application-mysql-test.yml
@@ -30,7 +30,7 @@ voms:
     trust-anchors-dir: /etc/grid-security/certificates
     trust-anchors-refresh-interval-secs: 14400
   aa:
-    host: voms.test.example
+    host: voms-aa.test.example
     port: ${server.port}
     vo-name: indigo-dc
     optional-group-label: voms.role
diff --git a/compose/docker-compose.ci.yml b/compose/docker-compose.ci.yml
index 5ed6eb1..a328457 100644
--- a/compose/docker-compose.ci.yml
+++ b/compose/docker-compose.ci.yml
@@ -84,6 +84,8 @@ services:
         condition: service_started
       trust:
         condition: service_completed_successfully
+
+    restart: unless-stopped
     
     environment:
       TZ: Europe/Rome