diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml
index 9f4ac577..5c3077dc 100644
--- a/group_vars/all/09_ports.yml
+++ b/group_vars/all/09_ports.yml
@@ -15,7 +15,7 @@ ports:
       web-app-yourls: 4184
       web-app-pgadmin: 4185
       web-app-phpldapadmin: 4186
-      fusiondirectory: 4187
+      web-app-fusiondirectory: 4187
       web-app-gitea: 4188
       web-app-snipe-it: 4189
     ldap:
@@ -59,7 +59,7 @@ ports:
       web-app-snipe-it: 8035
       web-app-sphinx: 8036
       web-app-phpldapadmin: 8037
-      fusiondirectory: 8038
+      web-app-fusiondirectory: 8038
       web-app-navigator: 8039
       web-app-espocrm: 8040
       syncope: 8041
diff --git a/group_vars/all/10_networks.yml b/group_vars/all/10_networks.yml
index 02ea7567..00dffa67 100644
--- a/group_vars/all/10_networks.yml
+++ b/group_vars/all/10_networks.yml
@@ -76,7 +76,7 @@ defaults_networks:
       subnet: 192.168.103.0/28
     web-app-phpldapadmin:
       subnet: 192.168.103.16/28
-    fusiondirectory:
+    web-app-fusiondirectory:
       subnet: 192.168.103.32/28
     web-app-navigator:
       subnet: 192.168.103.48/28
diff --git a/roles/web-app-bookwyrm/vars/main.yml b/roles/web-app-bookwyrm/vars/main.yml
index ee218d81..06c2a214 100644
--- a/roles/web-app-bookwyrm/vars/main.yml
+++ b/roles/web-app-bookwyrm/vars/main.yml
@@ -1 +1 @@
-application_id: bookwyrm
\ No newline at end of file
+application_id: web-app-bookwyrm
\ No newline at end of file
diff --git a/roles/web-app-fusiondirectory/vars/main.yml b/roles/web-app-fusiondirectory/vars/main.yml
index dd6ff92f..d0ac8c09 100644
--- a/roles/web-app-fusiondirectory/vars/main.yml
+++ b/roles/web-app-fusiondirectory/vars/main.yml
@@ -1 +1 @@
-application_id: "fusiondirectory"
\ No newline at end of file
+application_id: "web-app-fusiondirectory"
\ No newline at end of file
diff --git a/roles/web-app-oauth2-proxy/tasks/main.yml b/roles/web-app-oauth2-proxy/tasks/main.yml
index 93cc4e61..b61b6c13 100644
--- a/roles/web-app-oauth2-proxy/tasks/main.yml
+++ b/roles/web-app-oauth2-proxy/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: "Transfering oauth2-proxy-keycloak.cfg.j2 to {{( application_id | get_docker_paths(path_docker_compose_instances) ).directories.volumes }}"
   template:
     src:  "{{ playbook_dir }}/roles/web-app-oauth2-proxy/templates/oauth2-proxy-keycloak.cfg.j2"
-    dest: "{{( application_id | get_docker_paths(path_docker_compose_instances) ).directories.volumes }}{{applications | get_app_conf('oauth2-proxy','configuration_file')}}"
+    dest: "{{( application_id | get_docker_paths(path_docker_compose_instances) ).directories.volumes }}{{applications | get_app_conf('web-app-oauth2-proxy','configuration_file')}}"
   notify:
     - docker compose up
\ No newline at end of file
diff --git a/roles/web-app-oauth2-proxy/templates/container.yml.j2 b/roles/web-app-oauth2-proxy/templates/container.yml.j2
index 0be2c768..907c8475 100644
--- a/roles/web-app-oauth2-proxy/templates/container.yml.j2
+++ b/roles/web-app-oauth2-proxy/templates/container.yml.j2
@@ -1,11 +1,11 @@
 {% if applications | get_app_conf(application_id, 'features.oauth2', False) %}
   oauth2-proxy:
-    image: quay.io/oauth2-proxy/oauth2-proxy:{{applications['oauth2-proxy'].version}}
+    image: quay.io/oauth2-proxy/oauth2-proxy:{{applications['web-app-oauth2-proxy'].version}}
     restart: {{docker_restart_policy}}
     command: --config /oauth2-proxy.cfg
     hostname: oauth2-proxy
     ports:
       - {{ports.localhost.oauth2_proxy[application_id]}}:4180/tcp
     volumes:
-      - "{{docker_compose.directories.volumes}}{{applications | get_app_conf('oauth2-proxy','configuration_file')}}:/oauth2-proxy.cfg"
+      - "{{docker_compose.directories.volumes}}{{applications | get_app_conf('web-app-oauth2-proxy','configuration_file')}}:/oauth2-proxy.cfg"
 {% endif %}
\ No newline at end of file
diff --git a/roles/web-app-oauth2-proxy/vars/main.yml b/roles/web-app-oauth2-proxy/vars/main.yml
index 6c226977..2cf25fb9 100644
--- a/roles/web-app-oauth2-proxy/vars/main.yml
+++ b/roles/web-app-oauth2-proxy/vars/main.yml
@@ -1 +1 @@
-application_id: oauth2-proxy
\ No newline at end of file
+application_id: web-app-oauth2-proxy
\ No newline at end of file
diff --git a/tasks/utils/update-repository-with-files.yml b/tasks/utils/update-repository-with-files.yml
index 2fec1af6..c12e09d7 100644
--- a/tasks/utils/update-repository-with-files.yml
+++ b/tasks/utils/update-repository-with-files.yml
@@ -2,9 +2,9 @@
 # Better load the repositories into /opt/docker/[servicename]/services, build them there and then use a docker-compose file for customizing
 # @todo Refactor\Remove 
 # @deprecated
-- name: "Merge detached_files with applications | get_app_conf('oauth2-proxy','configuration_file')"
+- name: "Merge detached_files with applications | get_app_conf('web-app-oauth2-proxy','configuration_file')"
   set_fact:
-    merged_detached_files: "{{ detached_files + [applications | get_app_conf('oauth2-proxy','configuration_file')] }}"
+    merged_detached_files: "{{ detached_files + [applications | get_app_conf('web-app-oauth2-proxy','configuration_file')] }}"
   when: "{{ applications | get_app_conf(application_id,'features.oauth2')"
 
 - name: "backup detached files"