diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
index cf790d3..d930ed7 100644
--- a/roles/gitea/tasks/main.yml
+++ b/roles/gitea/tasks/main.yml
@@ -94,9 +94,9 @@
   register: gitea_deployment
   notify: "update gitea upstream"
 
-- name: Wait 30 seconds for gitea to become healthy
+- name: Wait a minute for gitea to become healthy
   wait_for:
-    timeout: 30
+    timeout: 60
   delegate_to: localhost
   when: gitea_deployment is changed
 
@@ -104,7 +104,7 @@
   ansible.builtin.command:
     cmd: docker ps -q -f name={{ stack_name }}_app
   become: true
-  until: gitea_app_container_name['rc'] == 0 and gitea_app_container_name['stdout'] | length >= 1
+  until: gitea_app_container_name['rc'] | default('') == 0 and gitea_app_container_name['stdout'] | length >= 1
   retries: 10
   delay: 10
   changed_when: False
@@ -116,9 +116,9 @@
     user: git
     command: >
       gitea admin user list --admin
-  until: gitea_admin_list is defined and gitea_admin_list['rc'] == 0
+  until: gitea_admin_list is defined and gitea_admin_list['rc'] | default('') == 0
   retries: 15
-  delay: 10
+  delay: 20
   become: true
   register: gitea_admin_list
   changed_when: gitea_admin_list['stdout_lines'] | length <= 1 and 'Username' in gitea_admin_list['stdout']