diff --git a/Makefile b/Makefile
index b0f63dc5..79c78fdf 100644
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,17 @@ clean:
 	@echo "Removing ignored git files"
 	git clean -fdX
 
+list:
+	@echo Generating the roles list
+	python3 main.py build roles_list
+
 tree:
 	@echo Generating Tree
 	python3 main.py build tree -D 2 --no-signal
 
+mig: list tree
+	@echo Creating meta data for meta infinity graph
+
 dockerignore:
 	@echo Create dockerignore
 	cat .gitignore > .dockerignore
@@ -61,7 +68,7 @@ build: clean dockerignore
 install: build
 	@echo "⚙️  Install complete."
 
-partial-test:
+messy-test:
 	@echo "🧪 Running Python tests…"
 	PYTHONPATH=. python -m unittest discover -s tests
 	@echo "📑 Checking Ansible syntax…"
diff --git a/roles/docker-compose/handlers/main.yml b/roles/docker-compose/handlers/main.yml
index 5d3a0221..739626cf 100644
--- a/roles/docker-compose/handlers/main.yml
+++ b/roles/docker-compose/handlers/main.yml
@@ -19,7 +19,7 @@
     - docker compose restart
 
 - name: docker compose up
-  shell: docker-compose -p {{ application_id }} up -d --force-recreate --remove-orphans --build
+  shell: docker-compose -p {{ application_id | get_entity_name }} up -d --force-recreate --remove-orphans --build
   args:
     chdir: "{{ docker_compose.directories.instance }}"
     executable: /bin/bash
diff --git a/roles/docker-compose/templates/networks.yml.j2 b/roles/docker-compose/templates/networks.yml.j2
index c5ca11db..f0bb8e36 100644
--- a/roles/docker-compose/templates/networks.yml.j2
+++ b/roles/docker-compose/templates/networks.yml.j2
@@ -18,7 +18,7 @@ networks:
   application_id in networks.local and 
   networks.local[application_id].subnet is defined
 %}
-    name: {{ application_id }}
+    name: {{ application_id | get_entity_name }}
     driver: bridge
     ipam:
       driver: default
diff --git a/roles/web-app-mastodon/config/main.yml b/roles/web-app-mastodon/config/main.yml
index c6c5bbcd..16268cab 100644
--- a/roles/web-app-mastodon/config/main.yml
+++ b/roles/web-app-mastodon/config/main.yml
@@ -1,5 +1,5 @@
 single_user_mode:     false                                           # Set true for initial setup
-setup:                false                                           # Set true in inventory file to execute the setup and initializing procedures, don't know if this is still necessary @todo test it                        
+setup:                true                                            # Set true in inventory file to execute the setup and initializing procedures, don't know if this is still necessary @todo test it                        
 features:
   matomo:             true
   css:                true
diff --git a/roles/web-app-mastodon/tasks/01_setup.yml b/roles/web-app-mastodon/tasks/01_setup.yml
new file mode 100644
index 00000000..612b1c0d
--- /dev/null
+++ b/roles/web-app-mastodon/tasks/01_setup.yml
@@ -0,0 +1,10 @@
+- name: flush docker service
+  meta: flush_handlers
+
+- name: "Execute migration for '{{ application_id }}'"
+  command:
+    cmd: "docker-compose run --rm web bundle exec rails db:migrate"
+    chdir: "{{docker_compose.directories.instance}}"  
+
+- name: "Include administrator routines for '{{ application_id }}'"
+  include_tasks: 02_administrator.yml
\ No newline at end of file
diff --git a/roles/web-app-mastodon/tasks/create-administrator.yml b/roles/web-app-mastodon/tasks/02_administrator.yml
similarity index 100%
rename from roles/web-app-mastodon/tasks/create-administrator.yml
rename to roles/web-app-mastodon/tasks/02_administrator.yml
diff --git a/roles/web-app-mastodon/tasks/main.yml b/roles/web-app-mastodon/tasks/main.yml
index 7a0d83e9..1ba7c779 100644
--- a/roles/web-app-mastodon/tasks/main.yml
+++ b/roles/web-app-mastodon/tasks/main.yml
@@ -16,15 +16,6 @@
     client_max_body_size: "80m"
     vhost_flavour:        "ws_generic"
 
-- name: flush docker service
-  meta: flush_handlers
-  when: mastodon_setup |bool 
-
-- name: setup routine for mastodon
-  command:
-    cmd: "docker-compose run --rm web bundle exec rails db:migrate"
-    chdir: "{{docker_compose.directories.instance}}"
-  when: mastodon_setup |bool 
-
-- name: "include create-administrator.yml for mastodon"
-  include_tasks: create-administrator.yml
\ No newline at end of file
+- name: "start setup procedures for mastodon"
+  include_tasks: 01_setup.yml
+  when: mastodon_setup |bool 
\ 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 b39cf46c..5abba653 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 {{(path_docker_compose_instances | get_docker_paths(application_id)).directories.volumes}}"
+- name: "Transfering oauth2-proxy-keycloak.cfg.j2 to {{( path_docker_compose_instances | get_docker_paths(application_id)).directories.volumes }}"
   template:
     src:  "{{ playbook_dir }}/roles/web-app-oauth2-proxy/templates/oauth2-proxy-keycloak.cfg.j2"
-    dest: "{{(path_docker_compose_instances | get_docker_paths(application_id)).directories.volumes}}{{applications | get_app_conf('oauth2-proxy','configuration_file')}}"
+    dest: "{{( path_docker_compose_instances | get_docker_paths(application_id)).directories.volumes }}{{applications | get_app_conf('oauth2-proxy','configuration_file')}}"
   notify:
     - docker compose up
\ No newline at end of file