diff --git a/roles/whoami/defaults/main.yml b/roles/whoami/defaults/main.yml
index 1f67fae..f14f6aa 100644
--- a/roles/whoami/defaults/main.yml
+++ b/roles/whoami/defaults/main.yml
@@ -2,6 +2,6 @@
 
 whoami_version: latest
 
-whoami_upstream_file_dir: "{{ docker_stack_files_dir }}/whoami"
+whoami_upstream_file_dir: "{{ docker_stack_files_dir }}/{{ stack.name }}"
 
 whoami_use_https: true
diff --git a/roles/whoami/handlers/main.yml b/roles/whoami/handlers/main.yml
index cdd6761..b3c57e5 100644
--- a/roles/whoami/handlers/main.yml
+++ b/roles/whoami/handlers/main.yml
@@ -1,7 +1,7 @@
 ## Register reverse proxy
 
 # figure out if upstream id exists
-- name: check whoami upstream
+- name: check {{ stack.name }} upstream
   community.docker.docker_container_exec:
     container: "{{ caddy_container_id }}"
     command: >
@@ -12,7 +12,7 @@
   listen: "update upstream"
 
 # upstream already exists, patch it
-- name: remove old whoami upstream
+- name: remove old {{ stack.name }} upstream
   community.docker.docker_container_exec:
     container: "{{ caddy_container_id }}"
     command: >
@@ -22,7 +22,7 @@
   listen: "update upstream"
 
 # upstream has to be created
-- name: add whoami upstream
+- name: add {{ stack.name }} upstream
   community.docker.docker_container_exec:
     container: "{{ caddy_container_id }}"
     command: >
diff --git a/roles/whoami/templates/docker-stack.yml.j2 b/roles/whoami/templates/docker-stack.yml.j2
index 32578ce..132c21e 100644
--- a/roles/whoami/templates/docker-stack.yml.j2
+++ b/roles/whoami/templates/docker-stack.yml.j2
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   app:
-    image: containous/whoami:{{ whoami_version }}
+    image: {{ stack_image }}:{{ whoami_version }}
     networks:
       - "{{ docker_swarm_public_network_name }}"
 
diff --git a/roles/whoami/vars/main.yml b/roles/whoami/vars/main.yml
index 97ede6e..80be9fa 100644
--- a/roles/whoami/vars/main.yml
+++ b/roles/whoami/vars/main.yml
@@ -1,6 +1,8 @@
 ---
 
+
 stack:
   name: whoami
   compose: "{{ lookup('template', 'docker-stack.yml.j2') | from_yaml }}"
 
+stack_image: "containous/whoami"