diff --git a/handlers/main.yaml b/handlers/main.yaml
index 5299767..3b5fef5 100644
--- a/handlers/main.yaml
+++ b/handlers/main.yaml
@@ -13,11 +13,17 @@
     project_src: /opt/gitea
   register: docker_compose
 
-- name: Check Gitea HTTP Response
+- name: Get Gitea HTTP Response
   ansible.builtin.uri:
     url: "https://{{ gitea.hostname }}.{{ gitea.domain }}"
-  register: _result
-  until: _result.status == 200
+  register: gitea_http_response
+  failed_when: 400 <= gitea_http_response.status < 500
+
+- name: Wait until Gitea is up
+  ansible.builtin.uri:
+    url: "https://{{ gitea.hostname }}.{{ gitea.domain }}"
+  register: gitea_http_response
+  until: gitea_http_response.status == 200
   retries: 30
   delay: 2
 
diff --git a/tasks/main.yaml b/tasks/main.yaml
index c703a16..fcfc825 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -72,7 +72,7 @@
     mode: "600"
   notify:
     - Ensure Gitea is restarted
-    - Check Gitea HTTP Response
+    - Wait until Gitea is up
 
 - name: Upload docker-compose.yaml
   ansible.builtin.template:
@@ -83,4 +83,4 @@
   notify:
     - Output Docker Compose State
     - Ensure Gitea is restarted
-    - Check Gitea HTTP Response
+    - Wait until Gitea is up