diff --git a/roles/whoami/defaults/main.yml b/roles/whoami/defaults/main.yml
index 2647014..1f67fae 100644
--- a/roles/whoami/defaults/main.yml
+++ b/roles/whoami/defaults/main.yml
@@ -3,3 +3,5 @@
 whoami_version: latest
 
 whoami_upstream_file_dir: "{{ docker_stack_files_dir }}/whoami"
+
+whoami_use_https: true
diff --git a/roles/whoami/handlers/main.yml b/roles/whoami/handlers/main.yml
index ae67fa9..cdd6761 100644
--- a/roles/whoami/handlers/main.yml
+++ b/roles/whoami/handlers/main.yml
@@ -9,24 +9,23 @@
   changed_when: False
   register: result
   become: yes
-  listen: "handle upstream"
+  listen: "update upstream"
+
+# upstream already exists, patch it
+- name: remove old whoami upstream
+  community.docker.docker_container_exec:
+    container: "{{ caddy_container_id }}"
+    command: >
+      curl -X DELETE localhost:2019/id/{{ stack.name }}_upstream/
+  become: yes
+  when: (result.stdout | from_json)['error'] is not defined
+  listen: "update upstream"
 
 # upstream has to be created
 - name: add whoami upstream
   community.docker.docker_container_exec:
     container: "{{ caddy_container_id }}"
     command: >
-      curl -X POST -H "Content-Type: application/json" -d @/stacks/{{ stack.name }}/upstream.json localhost:2019/config/apps/http/servers/srv0/routes/0/ 
+      curl -X POST -H "Content-Type: application/json" -d @/stacks/{{ stack.name }}/upstream.json localhost:2019/config/apps/http/servers/{{ (whoami_use_https == True) | ternary(caddy_https_server_name, caddy_http_server_name) }}/routes/0/ 
   become: yes
-  when: (result.stdout | from_json)['error'] is defined
-  listen: "handle upstream"
-
-# upstream already exists, patch it
-- name: patch whoami upstream
-  community.docker.docker_container_exec:
-    container: "{{ caddy_container_id }}"
-    command: >
-      curl -X PATCH -H "Content-Type: application/json" -d @/stacks/{{ stack.name }}/upstream.json localhost:2019/id/{{ stack.name }}_upstream/
-  become: yes
-  when: (result.stdout | from_json)['error'] is not defined
-  listen: "handle upstream"
+  listen: "update upstream"
diff --git a/roles/whoami/tasks/main.yml b/roles/whoami/tasks/main.yml
index 1a6e50c..cf4007c 100644
--- a/roles/whoami/tasks/main.yml
+++ b/roles/whoami/tasks/main.yml
@@ -16,7 +16,7 @@
   become: true
   tags: 
     - fs
-  notify: "handle upstream"
+  notify: "update upstream"
 
 - name: Deploy whoami to swarm
   community.general.docker_stack:
@@ -29,4 +29,4 @@
   become: yes
   tags:
     - docker-swarm
-  notify: "handle upstream"
+  notify: "update upstream"
diff --git a/roles/whoami/templates/upstream.json.j2 b/roles/whoami/templates/upstream.json.j2
index f272643..024897f 100644
--- a/roles/whoami/templates/upstream.json.j2
+++ b/roles/whoami/templates/upstream.json.j2
@@ -4,7 +4,7 @@
     "match": [
         {
             "host": [
-                "{{ stack.name }}.{{ domain }}"
+                "{{ stack.name }}.{{ server_domain }}"
             ]
         }
     ],