diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml
index a7d26a41..05b85ee5 100644
--- a/group_vars/all/09_ports.yml
+++ b/group_vars/all/09_ports.yml
@@ -33,7 +33,7 @@ ports:
       web-app-mastodon: 8009
       web-app-pixelfed: 8010
       web-app-peertube: 8011
-      funkwhale: 8012
+      web-app-funkwhale: 8012
       web-app-roulette-wheel: 8013
       web-app-joomla: 8014
       attendize: 8015
diff --git a/group_vars/all/10_networks.yml b/group_vars/all/10_networks.yml
index 46f9883a..93266d6c 100644
--- a/group_vars/all/10_networks.yml
+++ b/group_vars/all/10_networks.yml
@@ -20,7 +20,7 @@ defaults_networks:
       subnet: 192.168.101.64/28
     web-app-friendica:
       subnet: 192.168.101.80/28
-    funkwhale:
+    web-app-funkwhale:
       subnet: 192.168.101.96/28
     web-app-gitea:
       subnet: 192.168.101.112/28
diff --git a/roles/web-app-funkwhale/vars/main.yml b/roles/web-app-funkwhale/vars/main.yml
index 510c0103..6dbc563f 100644
--- a/roles/web-app-funkwhale/vars/main.yml
+++ b/roles/web-app-funkwhale/vars/main.yml
@@ -1,4 +1,4 @@
-application_id:                   "funkwhale"
+application_id:                   "web-app-funkwhale"
 proxy_extra_configuration:        "client_max_body_size 512M;"
 database_type:                    "postgres"
 funkwhale_media_root:             "/srv/funkwhale/data/"