diff --git a/roles/web-app-yourls/templates/docker-compose.yml.j2 b/roles/web-app-yourls/templates/docker-compose.yml.j2
index 255d7ab8..febe9825 100644
--- a/roles/web-app-yourls/templates/docker-compose.yml.j2
+++ b/roles/web-app-yourls/templates/docker-compose.yml.j2
@@ -1,8 +1,6 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
 
   application:
-{% set container_port = 80 %}
-{% set container_healthcheck = YOURLS_ADMIN_LOCATION %}
     image: "{{ YOURLS_IMAGE }}:{{ YOURLS_VERSION }}"
     container_name: "{{ YOURLS_CONTAINER }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
diff --git a/roles/web-app-yourls/vars/main.yml b/roles/web-app-yourls/vars/main.yml
index 39b02313..a6b9ec12 100644
--- a/roles/web-app-yourls/vars/main.yml
+++ b/roles/web-app-yourls/vars/main.yml
@@ -14,3 +14,6 @@ YOURLS_CONTAINER:               "{{ applications | get_app_conf(application_id,
 YOURLS_ADMIN_LOCATION:          "{{ applications | get_app_conf(application_id, 'server.locations.admin') }}"
 YOURLS_LANDINGPAGE_STATUS_CODE: "{{ applications | get_app_conf(application_id, 'server.status_codes.landingpage') }}"
 
+# Container
+container_port:                 8080
+container_healthcheck:          "{{ '' | safe_join(YOURLS_ADMIN_LOCATION) }}/"