diff --git a/tasks/consul.yml b/tasks/consul.yml
index c782838..c9455f9 100644
--- a/tasks/consul.yml
+++ b/tasks/consul.yml
@@ -9,11 +9,23 @@
         port: '{{ alertmanager_webui_port }}'
         address: '{{ ansible_local.wireguard.vpn_ip }}'
         checks:
-          - id: alertmanager-status
-            name: Alert Manager status
-            type: http
+          - id:   '{{ alertmanager_service_name }}-health'
+            name: 'Alert Manager Health'
+            type: 'http'
             http: 'http://localhost:{{ alertmanager_webui_port }}/api/v1/receivers'
 
+      - name: '{{ alertmanager_service_name }}-oauth'
+        tags: ['oauth-proxy', 'alertmanager', 'ssl-proxy-backend']
+        port: '{{ alertmanager_oauth_cont_port }}'
+        address: '{{ ansible_local.wireguard.vpn_ip }}'
+        meta:
+          proxy_fqdn: '{{ alertmanager_domain | mandatory }}'
+        checks:
+          - id:   '{{ alertmanager_service_name }}-oauth-health'
+            name: 'AlertManager OAuth Health'
+            type: 'http'
+            http: 'http://localhost:{{ alertmanager_oauth_cont_port }}/ping'
+
 # We need to do this for discover step to work
 - name: Reload Consul right away
   systemd:
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 441f982..7bad3ea 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -37,7 +37,7 @@ services:
     user: 'root'
     restart: 'always'
     ports:
-      - '127.0.0.1:{{ alertmanager_oauth_cont_port }}:{{ alertmanager_oauth_cont_port }}' # Web UI
+      - '0.0.0.0:{{ alertmanager_oauth_cont_port }}:{{ alertmanager_oauth_cont_port }}' # Web UI
     command: |
       --email-domain='*'
       --provider='github'