diff --git a/.vib/gitea/goss/goss-wait.yaml b/.vib/gitea/goss/goss-wait.yaml
new file mode 100644
index 0000000000..1e85445cbf
--- /dev/null
+++ b/.vib/gitea/goss/goss-wait.yaml
@@ -0,0 +1,10 @@
+# Copyright Broadcom, Inc. All Rights Reserved.
+# SPDX-License-Identifier: APACHE-2.0
+
+command:
+  # Fluentd requires to be stable before tracking log entries,
+  # increasing the resiliency of the tests.
+  wait-to-be-available:
+    exec: "sleep 300"
+    exit-status: 0
+    timeout: 310000
diff --git a/.vib/gitea/vib-verify.json b/.vib/gitea/vib-verify.json
index 28faaabd49..703d9f486e 100644
--- a/.vib/gitea/vib-verify.json
+++ b/.vib/gitea/vib-verify.json
@@ -36,6 +36,9 @@
             "resources": {
               "path": "/.vib"
             },
+            "wait": {
+              "file": "gitea/goss/goss-wait.yaml"
+            },
             "tests_file": "gitea/goss/goss.yaml",
             "vars_file": "gitea/runtime-parameters.yaml",
             "remote": {
diff --git a/bitnami/gitea/CHANGELOG.md b/bitnami/gitea/CHANGELOG.md
index 2552f399b3..544fea474c 100644
--- a/bitnami/gitea/CHANGELOG.md
+++ b/bitnami/gitea/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 2.3.12 (2024-07-15)
+## 2.3.13 (2024-07-15)
 
-* [bitnami/gitea] Release 2.3.12 ([#27964](https://github.com/bitnami/charts/pull/27964))
+* [bitnami/gitea] Include goss-wait test to improve test results ([#27980](https://github.com/bitnami/charts/pull/27980))
+
+## <small>2.3.12 (2024-07-15)</small>
+
+* [bitnami/gitea] Release 2.3.12 (#27964) ([48112ab](https://github.com/bitnami/charts/commit/48112ab4823167fd68daa82cda933f4f896acf7e)), closes [#27964](https://github.com/bitnami/charts/issues/27964)
 
 ## <small>2.3.11 (2024-07-05)</small>
 
diff --git a/bitnami/gitea/Chart.yaml b/bitnami/gitea/Chart.yaml
index 5705d69c98..b3e3e43a8e 100644
--- a/bitnami/gitea/Chart.yaml
+++ b/bitnami/gitea/Chart.yaml
@@ -37,4 +37,4 @@ maintainers:
 name: gitea
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/gitea
-version: 2.3.12
+version: 2.3.13