diff --git a/www-apps/authelia-bin/Manifest b/www-apps/authelia-bin/Manifest
index e56a58e..df5df15 100644
--- a/www-apps/authelia-bin/Manifest
+++ b/www-apps/authelia-bin/Manifest
@@ -1,7 +1,5 @@
 AUX authelia.confd 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
-AUX authelia.initd 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
-AUX authelia.service 236 BLAKE2B 1b9385fbf184a608f87d0c3eb98dd9fa5e01b53f3fabdafda77b2e14c6c04230f0107c1afd84fee619406a07b9df6df68419abb7894fca92772f85589046f866 SHA512 191788494db1b5d1d6a5c2566ed27e49110f4408e539994bcea136a8a600cda509180890e4ab5cb3754de95eb14f41cc9823aa602cb97f65d99ce132116dd209
-DIST authelia-bin-4.31.0-linux-amd64.tar.gz 15201725 BLAKE2B 88794bcbca1557a8fab68a88acfab4b9aa39cec74b5a2d557746ddd5a74561122dd9d707ec3d26aced8c550ed5b6ee939823b1e89baaf1f0fc2f8664a2e95402 SHA512 b4e3e819ac0eec61df7b4412a61b8069839e634993720d891b30585166b89b9f4c1b35b80cd2f743de1e90c2e9da3e8de12d4149f0aa54634b7e6ba4a85b0dc0
+AUX authelia.initd 838 BLAKE2B 39b6b4dfddaed1f277bc4dbfdb20e3f280d23b5685c031bc909179b6bc29afe37170c50dff0e80fe34dc5dee145c8e39a774dfe1c9c57e3c768c68f2ce217632 SHA512 270098a0e946167213656404d09460ed939b650be20f06fdb8195bbae140a6cb9705f0374f109bf7897347230f695af0c2b20383c371febc46ab5ac75e1de340
+AUX authelia.service 338 BLAKE2B 82bb76bc9c3fc97ecceeda62fa4b177c9b8b9790f553eb19b310affffbda18acbd357c09318fbf608a15b8d5ae613667f9af39f0e4dd0ea603520537b6d450fc SHA512 86188b3de4d1bd9dbf3ae35c42fc1e8bd37497b5f29c7a149a15324f6821428d90884e25fafe6f61f29765d713c0d48dc900329850686a4c44aeab279e9143c7
 DIST authelia-bin-4.36.3-linux-amd64.tar.gz 14623425 BLAKE2B 9a7b9c32ae9d72386600437d2047477933fb4d7170bf6c3de132c673a36d2dacdbb8b2f542603598a62308369767154f5cf703f28d9122a7d4f8025b96771130 SHA512 98f43bb69a6c2ab8a4a75f144af4544628771a043f3aefb39f984d1e2d7aeabd5cdca47fe25a5615817d30c4d1806a20c0c6dfcbcc4e31f18564897c1b1fe373
-EBUILD authelia-bin-4.31.0.ebuild 756 BLAKE2B 8f6272a3cf64817289c337ed78acf6b81c141f5a0ffbf1b6f15ceeeb12132a7e47ffe0a3243c3e2857a325bad0fd214dffb1b8972f5fbb5c52637e1298c4ef74 SHA512 c837f84b830df45f34488199de9d588355986248b3841e545e2dc4bebb191e4e6cb612903f70b696223aa996681a05abee8250e2718ffdae3fc5f9b40c598817
-EBUILD authelia-bin-4.36.3.ebuild 809 BLAKE2B ed608e7b8c40c16e9570afe2b2db7adff98cf47d584513fc238053c4671bd1ccc4edf1500e1070447d118d06221c0abe03136e09ad3bc52a39a3eaf0d8e2c065 SHA512 c55e4ac0f4a18e1c7dd0cf24f85ddaf0a65abc2348628f47a5135eab271dfe18d739f578c3301b459e7d100383a0a5b1729a8cc4a4f953fd89e67a63802e066d
+EBUILD authelia-bin-4.36.3.ebuild 809 BLAKE2B 73ffdaa7befdf953502637747236b225d21af949804ad0c4599fcc3f9817b21d0bbd5c9b68bd0c576fc41ef1bc072efb20c9d8b13803315512bc2bd94d6ea530 SHA512 b9eeec8cd8a401d8b8b1df128036220ee0d0bd9354a3544afdf1282a049acf5d4df5f17718f20db16804e12155cf429d39076b7d3130c6dfd6749d06f28134f5
diff --git a/www-apps/authelia-bin/authelia-bin-4.31.0.ebuild b/www-apps/authelia-bin/authelia-bin-4.31.0.ebuild
deleted file mode 100644
index 2d7a0f2..0000000
--- a/www-apps/authelia-bin/authelia-bin-4.31.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-
-EAPI="7"
-
-inherit systemd
-
-MY_PN="authelia"
-DESCRIPTION="Single Sign-On Multi-Factor portal for web apps"
-HOMEPAGE="https://github.com/authelia/authelia"
-SRC_URI="https://github.com/authelia/authelia/releases/download/v${PV}/${MY_PN}-v${PV}-linux-amd64.tar.gz -> ${P}-linux-amd64.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64"
-S="${WORKDIR}"
-
-QA_PRESTRIPPED="usr/bin/authelia"
-
-src_install() {
-	newbin authelia-linux-amd64 authelia
-	insinto /etc/authelia
-	doins config.template.yml
-
-	keepdir /etc/authelia/keys.d
-	keepdir /etc/authelia/certs.d
-
-	keepdir /var/lib/authelia
-	keepdir /var/log/authelia
-
-	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-	newconfd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-
-	systemd_dounit "${FILESDIR}/${MY_PN}.service"
-}
diff --git a/www-apps/authelia-bin/authelia-bin-4.36.3.ebuild b/www-apps/authelia-bin/authelia-bin-4.36.3.ebuild
index 6040ebb..6cc3fd4 100644
--- a/www-apps/authelia-bin/authelia-bin-4.36.3.ebuild
+++ b/www-apps/authelia-bin/authelia-bin-4.36.3.ebuild
@@ -32,7 +32,7 @@ src_install() {
 	keepdir /var/log/authelia
 
 	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-	newconfd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+	newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
 
 	systemd_dounit "${FILESDIR}/${MY_PN}.service"
 }
diff --git a/www-apps/authelia-bin/files/authelia.initd b/www-apps/authelia-bin/files/authelia.initd
index e69de29..f56ed9f 100644
--- a/www-apps/authelia-bin/files/authelia.initd
+++ b/www-apps/authelia-bin/files/authelia.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+AUTHELIA_USER="${AUTHELIA_USER:-authelia}"
+AUTHELIA_GROUP="${AUTHELIA_GROUP:-authelia}"
+AUTHELIA_CONFIG="${AUTHELIA_CONFIG:-/etc/authelia/config.yml}"
+AUTHELIA_DATA_DIR="${AUTHELIA_DATA_DIR:-/var/lib/authelia}"
+AUTHELIA_LOG_DIR="${AUTHELIA_LOG_DIR:-/var/log/authelia}"
+
+command="/usr/bin/authelia"
+command_args="--config ${AUTHELIA_CONFIG}"
+
+pidfile="/run/${RC_SVCNAME}.pid"
+command_background="true"
+start_stop_daemon_args="--user=\"${AUTHELIA_USER}\" --group=\"${AUTHELIA_GROUP}\" --stdout ${AUTHELIA_LOG_DIR}/authelia.log --stderr ${AUTHELIA_LOG_DIR}/authelia.err"
+
+start_pre() {
+	checkpath -d -o "${AUTHELIA_USER}" -m750 "${AUTHELIA_DATA_DIR}"
+	checkpath -d -o "${AUTHELIA_USER}" -m750 "${AUTHELIA_LOG_DIR}"
+}
diff --git a/www-apps/authelia-bin/files/authelia.service b/www-apps/authelia-bin/files/authelia.service
index d6eb616..a4f5866 100644
--- a/www-apps/authelia-bin/files/authelia.service
+++ b/www-apps/authelia-bin/files/authelia.service
@@ -1,10 +1,18 @@
 [Unit]
-Description=Authelia authentication and authorization server
-After=multi-user.target
+Description=Authelia Web Application
+After=network.target
 
 [Service]
-ExecStart=/usr/bin/authelia --config /etc/authelia/configuration.yml
-SyslogIdentifier=authelia
+WorkingDirectory=/var/lib/authelia
+StateDirectory=authelia
+StateDirectoryMode=0750
+CacheDirectory=authelia
+CacheDirectoryMode=0750
+
+User=authelia
+Group=authelia
+
+ExecStart=/usr/bin/authelia --config /etc/authelia/config.yml
 
 [Install]
 WantedBy=multi-user.target