diff --git a/www-apps/gatus/Manifest b/www-apps/gatus/Manifest
index 3baf381..f4a1a2b 100644
--- a/www-apps/gatus/Manifest
+++ b/www-apps/gatus/Manifest
@@ -1,2 +1,2 @@
-DIST gatus-5.33.1.11-deps.tar.gz 50967594 BLAKE2B dbc692975dd9244ed79f0c039b8a5738ebf9c6067f787fd1b7a4ef54dcecdccb252897aa785886a3f91c92aebae095706a4c63dbe3d8b71795831e3c8697d1d6 SHA512 df1c6e4ddeda447ae341f7b6b11d607babfb67400324908fd267542e0478ebcb8fa8ae881dca9ead56cbf3edefaaae3ffa2d9d77824e740d48440a16e33eb244
-DIST gatus-5.33.1.11.tar.gz 2967920 BLAKE2B 88e9421bd312eb8f3314bc7df353dab1b11f6d50eeb4f3353147f06326098b0d8e352be458f9a8f85909dc6aaa9fba090d0fcf79843d1e740381df3e155e7e89 SHA512 f450b9bfc9cb30b58adba1792e744382ab81f9651b3b6a733a3bdd155212694243d9582ab532cf084a42b4e55c5aa32adf321d152cf45a4e2aeae8bc168a8a50
+DIST gatus-5.36.0-deps.tar.xz 27527448 BLAKE2B 4354213c72c0264088e7984c9c042f8f4427759c748fedfa53c73739d2554be272884f7deec360660825b3aaae265b4fe1fbe9597b2a83327a10f95878f3f1e7 SHA512 df964ea8d498350746f6a115fc3768b80853ce87081f35d572dd874e8a05792271bf3edf46a4defb6e05394124df94318078072d36c198cce98872549bda2c7e
+DIST gatus-5.36.0.tar.gz 2975523 BLAKE2B b3147b23aea7d06a635db5875ab93b320eea9bc1c49bbcb2b9ede8a941fec0975e54e036d4a3f8f5d6c78e2bf1ef7c018be15a2777f374fb2099d21dfe117f6b SHA512 ca6873a6ecfde0f6b46fb34d5a9d2b63a32ad31a2bd77a940dc9ae81362d45f7aa2cc9945f297e26858a77a01750d22eff341f88837c2e501b7acdadab436ece
diff --git a/www-apps/gatus/files/gatus.confd-r0 b/www-apps/gatus/files/gatus.confd-r0
new file mode 100644
index 0000000..58c70dc
--- /dev/null
+++ b/www-apps/gatus/files/gatus.confd-r0
@@ -0,0 +1,7 @@
+# vim: ft=sh
+# Path to configuration file
+# It can either load a single file from the get-go, or a series of files inside the directory, in YAML format
+# GATUS_CONFIG_PATH=""
+# Log levels (one of DEBUG, INFO, WARN, ERROR, FATAL)
+# Default is INFO
+# GATUS_LOG_LEVEL=""
diff --git a/www-apps/gatus/files/gatus.initd-r0 b/www-apps/gatus/files/gatus.initd-r0
index 4ac19a1..88f8f0b 100644
--- a/www-apps/gatus/files/gatus.initd-r0
+++ b/www-apps/gatus/files/gatus.initd-r0
@@ -1,17 +1,11 @@
 #!/sbin/openrc-run
 # Copyright 2026 Shin'ya Minazuki
 
+: ${GATUS_CONFIG_PATH="/etc/gatus/config.yaml"}
+: ${GATUS_LOG_LEVEL="INFO"}
+
 supervisor="supervise-daemon"
 command="/usr/bin/${RC_SVCNAME}"
-command_args="-config /etc/${RC_SVCNAME}/config.yaml"
 command_background="true"
 command_user="${RC_SVCNAME}"
 pidfile="/run/${RC_SVCNAME}.pid"
-
-start_pre() {
-	ebegin "Checking for the existence of /etc/${RC_SVCNAME}/config.yaml ..."
-	if ! checkpath --file /etc/${RC_SVCNAME}/config.yaml; then
-		eerror "Configuration file not found"
-		eerror "Bailing out."
-	fi
-}
diff --git a/www-apps/gatus/gatus-5.33.1.11.ebuild b/www-apps/gatus/gatus-5.36.0.ebuild
similarity index 66%
rename from www-apps/gatus/gatus-5.33.1.11.ebuild
rename to www-apps/gatus/gatus-5.36.0.ebuild
index c1dac01..ac567be 100644
--- a/www-apps/gatus/gatus-5.33.1.11.ebuild
+++ b/www-apps/gatus/gatus-5.36.0.ebuild
@@ -3,15 +3,12 @@ EAPI=8
 
 inherit go-module optfeature
 
-DESCRIPTION="Developer-oriented health dashboard for monitoring services (modified)"
+DESCRIPTION="Developer-oriented health dashboard for monitoring services"
 HOMEPAGE="https://github.com/TWiN/gatus"
 SRC_URI="
-	https://distfiles.chaotic.ninja/pub/${PN}/${P}.tar.gz
-	https://distfiles.chaotic.ninja/pub/${PN}/${P}-deps.tar.gz
+	https://github.com/TwiN/gatus/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://distfiles.chaotic.ninja/pub/${PN}/${P}-deps.tar.xz
 "
-# Per licensing terms, modified copies should not have the same name
-# as the upstream project, but it is not like I can do anything
-# about it, this isn't a fork.
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -30,6 +27,7 @@ src_compile() {
 
 src_install() {
 	newinitd "${FILESDIR}/gatus.initd-r0" "${PN}"
+	newconfd "${FILESDIR}/gatus.confd-r0" "${PN}"
 	dobin "${PN}"
 	insinto "/etc/gatus"
 	doins config.yaml
diff --git a/www-apps/gatus/metadata.xml b/www-apps/gatus/metadata.xml
index dfd1f28..0df5c62 100644
--- a/www-apps/gatus/metadata.xml
+++ b/www-apps/gatus/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>shinyoukai@laidback.moe</email>
+		<email>shinyoukai@chaotic.ninja</email>
 		<name>Shin'ya Minazuki</name>
 	</maintainer>
 	<upstream>