diff --git a/roles/podman_keycloak/tasks/main.yml b/roles/podman_keycloak/tasks/main.yml
index 0626281..9068847 100644
--- a/roles/podman_keycloak/tasks/main.yml
+++ b/roles/podman_keycloak/tasks/main.yml
@@ -4,7 +4,7 @@
     role: sr2c.core.podman_host
   vars:
     podman_host_minimum_unpriv_port: 80
-    podman_host_rootless_users: ["{{ podman_keycloak_podman_rootless_user }}"]
+    podman_host_rootless_users: ["keycloak"]
 
 - name: Podman Keycloak | PATCH | Enable http service with firewalld
   ansible.posix.firewalld:
@@ -22,6 +22,7 @@
     permanent: true
     zone: public
 
+# TODO: These will be relabelled by podman but in the future we should label them from the start
 - name: Podman Keycloak | PATCH | Create service configuration directories
   ansible.builtin.file:
     path: "/home/{{ podman_keycloak_podman_rootless_user }}/{{ item }}"
@@ -44,7 +45,7 @@
   with_items: "{{ podman_keycloak_keycloak_providers }}"
   become: true
   become_user: "{{ podman_keycloak_podman_rootless_user }}"
-  notify: Restart keycloak
+  notify: restart keycloak
 
 - name: Podman Keycloak | PATCH | Install systemd target
   ansible.builtin.template:
@@ -141,7 +142,7 @@
     group: "{{ podman_keycloak_podman_rootless_user }}"
     mode: "0644"
   become: true
-  notify: Restart nginx
+  notify: restart nginx
 
 - name: Podman Keycloak | PATCH | Configure the LDAP directory
   ansible.builtin.include_tasks:
diff --git a/roles/podman_keycloak/templates/nginx.conf b/roles/podman_keycloak/templates/nginx.conf
index d63f7de..c98d07c 100644
--- a/roles/podman_keycloak/templates/nginx.conf
+++ b/roles/podman_keycloak/templates/nginx.conf
@@ -1,12 +1,5 @@
 # {{ ansible_managed }}
 
-resolver 10.89.0.1 ipv6=off valid=10s;
-
-upstream keycloak {
-    zone keycloak_upstream 64k;
-	server keycloak:8080 resolve;
-}
-
 server {
     listen 80;
     listen [::]:80;
@@ -35,15 +28,12 @@ server {
     ssl_certificate_key /etc/letsencrypt/live/{{ podman_keycloak_keycloak_hostname }}/privkey.pem;
 
     location / {
-        proxy_pass http://keycloak;
+        proxy_pass http://keycloak:8080/;
         proxy_redirect off;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-Port 443;
-        proxy_buffer_size 128k;
-        proxy_buffers 4 256k;
-        proxy_busy_buffers_size 256k;
     }
 }
diff --git a/roles/podman_nginx/tasks/main.yml b/roles/podman_nginx/tasks/main.yml
index 271c70e..7308833 100644
--- a/roles/podman_nginx/tasks/main.yml
+++ b/roles/podman_nginx/tasks/main.yml
@@ -6,7 +6,6 @@
     permanent: true
     immediate: true
     state: enabled
-  become: true
   with_items:
     - http
     - https