diff --git a/documentation/revision-history.md b/documentation/revision-history.md
index 672d889e8..7500ef7b9 100644
--- a/documentation/revision-history.md
+++ b/documentation/revision-history.md
@@ -275,5 +275,7 @@ adding report template format fk and permissions
 - adding import modules for Palo Alto and Azure Firewall
 - Workflow Module: adding delete rule request and integrated path analysis into workflow
 
-### 6.2.1 17.03.2023 MAIN
+### 6.2.1 18.03.2023 MAIN
 - fix ldap issues - closes ldap bugs #2023
+- reduced logging in release mode
+- hasura v2.21.0 upgrade
diff --git a/inventory/group_vars/apiserver.yml b/inventory/group_vars/apiserver.yml
index 97abdc9bc..0e6358d8b 100644
--- a/inventory/group_vars/apiserver.yml
+++ b/inventory/group_vars/apiserver.yml
@@ -8,7 +8,7 @@ api_hasura_admin_test_password: "not4production"
 api_user_email: "{{ api_user }}@{{ api_network_listening_ip_address }}"
 api_home: "{{ fworch_home }}/api"
 api_hasura_cli_bin: "{{ fworch_home }}/api/bin/hasura"
-api_hasura_version: "v2.16.1"
+api_hasura_version: "v2.21.0"
 api_project_name: api
 api_no_metadata: false
 api_rollback_is_running: false
diff --git a/roles/test/tasks/test-web.yml b/roles/test/tasks/test-web.yml
index 4771eddf5..941dadd25 100644
--- a/roles/test/tasks/test-web.yml
+++ b/roles/test/tasks/test-web.yml
@@ -1,5 +1,13 @@
 # this playbook contains web server availabitlity tests
 
+# TODO - find out why UI sometimes crashes during upgrade of heavy data installations
+- name: restart UI to avoid testing against crashed UI
+  ansible.builtin.systemd:
+    name: "{{ product_name }}-ui"
+    state: restarted
+  become: true
+  when: "'frontends' in group_names"
+
 - name: test web server availability
   uri:
     url: "{{ loop_url }}"
@@ -12,6 +20,9 @@
   register: web_call_result
   changed_when: false
   failed_when: false
+  until: web_call_result.status == 200
+  retries: 10 # 10 * 5 seconds
+  delay: 5 # Every 5 seconds
   loop:
     - "{{ middleware_uri }}/swagger/"
     - https://{{ ui_hostname }}/