diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml
index 5c3077dc..2b1fcb84 100644
--- a/group_vars/all/09_ports.yml
+++ b/group_vars/all/09_ports.yml
@@ -62,7 +62,7 @@ ports:
       web-app-fusiondirectory: 8038
       web-app-navigator: 8039
       web-app-espocrm: 8040
-      syncope: 8041
+      web-app-syncope: 8041
       web-app-collabora: 8042
       web-app-mobilizon: 8043
       web-svc-simpleicons: 8044
diff --git a/group_vars/all/10_networks.yml b/group_vars/all/10_networks.yml
index 00dffa67..5a1ad57f 100644
--- a/group_vars/all/10_networks.yml
+++ b/group_vars/all/10_networks.yml
@@ -82,7 +82,7 @@ defaults_networks:
       subnet: 192.168.103.48/28
     web-app-espocrm:
       subnet: 192.168.103.64/28
-    syncope:
+    web-app-syncope:
       subnet: 192.168.103.80/28
     web-app-collabora:
       subnet: 192.168.103.96/28
diff --git a/roles/dev-locales/vars/main.yml b/roles/dev-locales/vars/main.yml
index 868a4b92..b27ede1a 100644
--- a/roles/dev-locales/vars/main.yml
+++ b/roles/dev-locales/vars/main.yml
@@ -1 +1 @@
-application_id: locales
+application_id: dev-locales
diff --git a/roles/dev-nodejs/vars/main.yml b/roles/dev-nodejs/vars/main.yml
index 7b0e495a..6d17124c 100644
--- a/roles/dev-nodejs/vars/main.yml
+++ b/roles/dev-nodejs/vars/main.yml
@@ -1 +1 @@
-application_id: nodejs
+application_id: dev-nodejs
diff --git a/roles/web-app-jenkins/vars/main.yml b/roles/web-app-jenkins/vars/main.yml
index c9475dd8..ad09502d 100644
--- a/roles/web-app-jenkins/vars/main.yml
+++ b/roles/web-app-jenkins/vars/main.yml
@@ -1 +1 @@
-application_id: jenkins
\ No newline at end of file
+application_id: web-app-jenkins
\ No newline at end of file
diff --git a/roles/web-app-socialhome/vars/main.yml b/roles/web-app-socialhome/vars/main.yml
index 6addcaee..5524e3bd 100644
--- a/roles/web-app-socialhome/vars/main.yml
+++ b/roles/web-app-socialhome/vars/main.yml
@@ -1 +1 @@
-application_id: socialhome
\ No newline at end of file
+application_id: web-app-socialhome
\ No newline at end of file
diff --git a/roles/web-app-syncope/vars/main.yml b/roles/web-app-syncope/vars/main.yml
index 6e2884c9..79dd1f67 100644
--- a/roles/web-app-syncope/vars/main.yml
+++ b/roles/web-app-syncope/vars/main.yml
@@ -1,5 +1,5 @@
 # General Configuration
-application_id:                 syncope
+application_id:                 web-app-syncope
 database_type:                  "postgres"
 database_password:              "{{ domains | get_domain(application_id).credentials.database_password }}"
 
diff --git a/roles/web-app-xmpp/vars/main.yml b/roles/web-app-xmpp/vars/main.yml
index d015404b..a867b7e4 100644
--- a/roles/web-app-xmpp/vars/main.yml
+++ b/roles/web-app-xmpp/vars/main.yml
@@ -1 +1 @@
-application_id: xmpp
\ No newline at end of file
+application_id: web-app-xmpp
\ No newline at end of file