diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml
index f199391a..64bb4a58 100644
--- a/group_vars/all/09_ports.yml
+++ b/group_vars/all/09_ports.yml
@@ -12,7 +12,7 @@ ports:
       web-app-phpmyadmin: 4181
       web-app-lam: 4182
       web-app-openproject: 4183
-      yourls: 4184
+      web-app-yourls: 4184
       pgadmin: 4185
       phpldapadmin: 4186
       fusiondirectory: 4187
@@ -27,7 +27,7 @@ ports:
       web-app-wordpress: 8003
       web-app-mediawiki: 8004
       web-app-mybb: 8005
-      yourls: 8006
+      web-app-yourls: 8006
       web-app-mailu: 8007
       web-app-elk: 8008
       web-app-mastodon: 8009
diff --git a/group_vars/all/10_networks.yml b/group_vars/all/10_networks.yml
index 22f70d11..03b32a99 100644
--- a/group_vars/all/10_networks.yml
+++ b/group_vars/all/10_networks.yml
@@ -66,7 +66,7 @@ defaults_networks:
       subnet: 192.168.102.160/28
     taiga:
       subnet: 192.168.102.176/28
-    yourls:
+    web-app-yourls:
       subnet: 192.168.102.192/28
     web-app-discourse:
       subnet: 192.168.102.208/28
diff --git a/roles/sys-hlth-webserver/templates/sys-hlth-webserver.py.j2 b/roles/sys-hlth-webserver/templates/sys-hlth-webserver.py.j2
index b08b4d58..a6f0b12c 100644
--- a/roles/sys-hlth-webserver/templates/sys-hlth-webserver.py.j2
+++ b/roles/sys-hlth-webserver/templates/sys-hlth-webserver.py.j2
@@ -19,7 +19,7 @@ def get_expected_statuses(domain: str, parts: list[str], redirected_domains: set
         return [404]
     if (parts and parts[0] == 'www') or (domain in redirected_domains):
         return [301]
-    if domain == '{{domains | get_domain('yourls')}}':
+    if domain == '{{domains | get_domain('web-app-yourls')}}':
         return [403]
     return [200, 302, 301]
 
diff --git a/roles/web-app-yourls/config/main.yml b/roles/web-app-yourls/config/main.yml
index dd7207e3..21905cfe 100644
--- a/roles/web-app-yourls/config/main.yml
+++ b/roles/web-app-yourls/config/main.yml
@@ -1,16 +1,15 @@
-version:              "latest"
 oauth2_proxy:  
   application:        "application"
   port:               "80"
   allowed_groups:
-    - "yourls-administrator"
+    - "web-app-yourls-administrator"
   acl:
     blacklist:
       - "/admin/"     # Protects the admin area
 features:
   matomo:             true
   css:                true
-  port-ui-desktop:   true
+  port-ui-desktop:    true
   central_database:   true
   oauth2:             true
 domains:
@@ -21,4 +20,8 @@ domains:
 docker:
   services:
     database:
-      enabled: true
\ No newline at end of file
+      enabled: true
+    yourls: 
+      version:    "latest"
+      name:       "yourls" 
+      image:      "yourls"
\ No newline at end of file
diff --git a/roles/web-app-yourls/templates/docker-compose.yml.j2 b/roles/web-app-yourls/templates/docker-compose.yml.j2
index 51b9be12..ad116163 100644
--- a/roles/web-app-yourls/templates/docker-compose.yml.j2
+++ b/roles/web-app-yourls/templates/docker-compose.yml.j2
@@ -3,7 +3,8 @@
   application:
 {% set container_port = 80 %}
 {% set container_healthcheck = 'http://127.0.0.1/admin/' %}
-    image: yourls:{{applications.yourls.version}}
+    image: "{{ yourls_image }}:{{ yourls_version }}"
+    container_name: "{{ yourls_container }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
diff --git a/roles/web-app-yourls/templates/env.j2 b/roles/web-app-yourls/templates/env.j2
index 0ed2b62f..00e04856 100644
--- a/roles/web-app-yourls/templates/env.j2
+++ b/roles/web-app-yourls/templates/env.j2
@@ -1,9 +1,9 @@
-YOURLS_DB_HOST: "{{database_host}}"
-YOURLS_DB_USER: "{{database_username}}"
-YOURLS_DB_PASS: "{{database_password}}"
-YOURLS_DB_NAME: "{{database_name}}"
+YOURLS_DB_HOST: "{{ database_host }}"
+YOURLS_DB_USER: "{{ database_username }}"
+YOURLS_DB_PASS: "{{ database_password }}"
+YOURLS_DB_NAME: "{{ database_name }}"
 YOURLS_SITE:    "{{ domains | get_url(application_id, web_protocol) }}"
-YOURLS_USER:    "{{applications.yourls.users.administrator.username}}"
-YOURLS_PASS:    "{{applications | get_app_conf(application_id, 'credentials.administrator_password', True)}}"
+YOURLS_USER:    "{{ yourls_user }}"
+YOURLS_PASS:    "{{ yourls_password }}"
 # The following deactivates the login mask for admins, if the oauth2 proxy is activated 
 YOURLS_PRIVATE: "{{not (applications | get_app_conf(application_id, 'features.oauth2', False))}}" 
\ No newline at end of file
diff --git a/roles/web-app-yourls/vars/main.yml b/roles/web-app-yourls/vars/main.yml
index f97d046b..29f17bac 100644
--- a/roles/web-app-yourls/vars/main.yml
+++ b/roles/web-app-yourls/vars/main.yml
@@ -1,2 +1,7 @@
-application_id: "yourls"
-database_type:  "mariadb"
\ No newline at end of file
+application_id:   "web-app-yourls"
+database_type:    "mariadb"
+yourls_user:      "{{ applications | get_app_conf(application_id, 'users.administrator.username', True) }}"
+yourls_password:  "{{ applications | get_app_conf(application_id, 'credentials.administrator_password', True) }}"
+yourls_version:   "{{ applications | get_app_conf(application_id, 'docker.services.yourls.version', True) }}"
+yourls_image:     "{{ applications | get_app_conf(application_id, 'docker.services.yourls.image', True) }}"
+yourls_name:      "{{ applications | get_app_conf(application_id, 'docker.services.yourls.name', True) }}"
\ No newline at end of file