diff --git a/defaults/main.yml b/defaults/main.yml
index de49cb31d3d9b4855022bf4a349806cab47514c0..91418877ba18a1e3f6cea06bf2e7ed86f12ef06e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-keycloak_version: 7.0.0
+keycloak_version: 8.0.2
 keycloak_dir: /var/keycloak
 keycloak_archive: keycloak-{{ keycloak_version }}.tar.gz
 keycloak_url: http://downloads.jboss.org/keycloak/{{ keycloak_version }}/{{keycloak_archive }}
@@ -7,4 +7,4 @@ keycloak_jboss_home: "{{ keycloak_dir }}/keycloak-{{ keycloak_version }}"
 keycloak_log_dir: "{{ keycloak_jboss_home }}/standalone/log"
 keycloak_proxy_address_forwarding: "false"
 keycloak_custom_themes: []
-keycloak_custom_deployments: []
\ No newline at end of file
+keycloak_custom_deployments: []
diff --git a/tasks/main.yml b/tasks/main.yml
index b053e656320e0d55abb8328e0a4d52a1435e4918..2937e96208996fb18a849cab8609c98ec3f17c3b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -124,7 +124,7 @@
     value: "{{ keycloak_proxy_address_forwarding }}"
     namespaces:
       x: urn:jboss:domain:10.0
-      y: urn:jboss:domain:undertow:9.0
+      y: urn:jboss:domain:undertow:10.0
   notify: restart keycloak
 
 - name: Create user and db on server