diff --git a/www/homer/Makefile b/www/homer/Makefile
index cdfae06d8b5e..75644fb87a77 100644
--- a/www/homer/Makefile
+++ b/www/homer/Makefile
@@ -1,33 +1,37 @@
 PORTNAME=	homer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	23.10.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
 DISTNAME=	homer
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Dead simple static HOMepage for your servER
 WWW=		https://github.com/bastienwirtz/homer
 
 LICENSE=	APACHE20
 
 USES=		zip
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	bastienwirtz
 
 NO_ARCH=	YES
 NO_BUILD=	YES
 
-PLIST_SUB=	HOMER_USERNAME=${WWWOWN}
-
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${CP} -a ${WRKDIR}/*.js ${WRKDIR}/logo.png ${WRKDIR}/index.html ${STAGEDIR}${WWWDIR}
 	${MKDIR} ${STAGEDIR}${WWWDIR}/assets
 	cd ${WRKDIR}/assets && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/assets
 	${MKDIR} ${STAGEDIR}${WWWDIR}/resources
 	cd ${WRKDIR}/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/resources
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/assets/config.yml.dist \
-		${STAGEDIR}${WWWDIR}/assets/config.yml
+		${STAGEDIR}${ETCDIR}/config.yml
+
+post-install:
+	${RLN} ${STAGEDIR}${ETCDIR}/config.yml ${STAGEDIR}${WWWDIR}/assets/config.yml
+
 
 .include <bsd.port.mk>
diff --git a/www/homer/pkg-plist b/www/homer/pkg-plist
index 6477ccb8ff81..c0f5519e8d84 100644
--- a/www/homer/pkg-plist
+++ b/www/homer/pkg-plist
@@ -1,94 +1,91 @@
-@owner %%HOMER_USERNAME%%
-@dir %%WWWDIR%%/assets
-@dir %%WWWDIR%%/assets/icons
-@dir %%WWWDIR%%/assets/tools
-@dir %%WWWDIR%%/resources
+@dir %%ETCDIR%%
 %%WWWDIR%%/assets/additional-page.yml.dist
 %%WWWDIR%%/assets/config-demo.yml.dist
-@sample %%WWWDIR%%/assets/config.yml.dist %%WWWDIR%%/assets/config.yml
+%%WWWDIR%%/assets/config.yml
+@sample %%WWWDIR%%/assets/config.yml.dist %%ETCDIR%%/config.yml
 %%WWWDIR%%/assets/config.yml.dist.sample-sui
 %%WWWDIR%%/assets/custom.css.sample
 %%WWWDIR%%/assets/icons/README.md
 %%WWWDIR%%/assets/icons/apple-touch-icon.png
 %%WWWDIR%%/assets/icons/favicon.ico
 %%WWWDIR%%/assets/icons/logo.svg
 %%WWWDIR%%/assets/icons/pwa-192x192.png
 %%WWWDIR%%/assets/icons/pwa-512x512.png
 %%WWWDIR%%/assets/manifest.json
 %%WWWDIR%%/assets/tools/sample.png
 %%WWWDIR%%/assets/tools/sample2.png
 %%WWWDIR%%/index.html
 %%WWWDIR%%/logo.png
 %%WWWDIR%%/registerSW.js
 %%WWWDIR%%/resources/AdGuardHome-d2abc97d.css
 %%WWWDIR%%/resources/AdGuardHome-fecde3a1.js
 %%WWWDIR%%/resources/CopyToClipboard-a17573c3.css
 %%WWWDIR%%/resources/CopyToClipboard-b2b7dc6a.js
 %%WWWDIR%%/resources/Emby-1c49ce56.css
 %%WWWDIR%%/resources/Emby-b769a07d.js
 %%WWWDIR%%/resources/Healthchecks-8cddc8b3.css
 %%WWWDIR%%/resources/Healthchecks-9619688b.js
 %%WWWDIR%%/resources/Immich-4c5b12d2.css
 %%WWWDIR%%/resources/Immich-a4603481.js
 %%WWWDIR%%/resources/Lidarr-0bdf3dff.js
 %%WWWDIR%%/resources/Lidarr-f62c6a04.css
 %%WWWDIR%%/resources/Mealie-117c133a.js
 %%WWWDIR%%/resources/Medusa-c8c7f235.js
 %%WWWDIR%%/resources/Medusa-e73e6d80.css
 %%WWWDIR%%/resources/OctoPrint-53d07bf8.css
 %%WWWDIR%%/resources/OctoPrint-eb483722.js
 %%WWWDIR%%/resources/OpenWeather-6f7e5663.js
 %%WWWDIR%%/resources/OpenWeather-c3a274b3.css
 %%WWWDIR%%/resources/PaperlessNG-c06cce1d.js
 %%WWWDIR%%/resources/PiAlert-246f920d.css
 %%WWWDIR%%/resources/PiAlert-4242aa38.js
 %%WWWDIR%%/resources/PiHole-52753e9a.css
 %%WWWDIR%%/resources/PiHole-a59fe1a8.js
 %%WWWDIR%%/resources/Ping-b7588b21.js
 %%WWWDIR%%/resources/Ping-f54b6bba.css
 %%WWWDIR%%/resources/Portainer-133da12f.css
 %%WWWDIR%%/resources/Portainer-80f1adf9.js
 %%WWWDIR%%/resources/Prometheus-0f0a25d4.css
 %%WWWDIR%%/resources/Prometheus-67ffe91c.js
 %%WWWDIR%%/resources/Prowlarr-2c1ae3fa.css
 %%WWWDIR%%/resources/Prowlarr-86bf34cc.js
 %%WWWDIR%%/resources/Proxmox-12646ca6.js
 %%WWWDIR%%/resources/Proxmox-b285e845.css
 %%WWWDIR%%/resources/Radarr-8f1ea120.js
 %%WWWDIR%%/resources/Radarr-eb9f7ff0.css
 %%WWWDIR%%/resources/Readarr-75a61ff8.js
 %%WWWDIR%%/resources/Readarr-f3169763.css
 %%WWWDIR%%/resources/Rtorrent-138cbc9a.js
 %%WWWDIR%%/resources/Rtorrent-824b1b8b.css
 %%WWWDIR%%/resources/SABnzbd-152c578e.css
 %%WWWDIR%%/resources/SABnzbd-7c17e143.js
 %%WWWDIR%%/resources/Sonarr-1dfb8d14.css
 %%WWWDIR%%/resources/Sonarr-215c12ee.js
 %%WWWDIR%%/resources/SpeedtestTracker-3cb58f2f.js
 %%WWWDIR%%/resources/Tautulli-16dd4ee7.js
 %%WWWDIR%%/resources/Tautulli-2f399779.css
 %%WWWDIR%%/resources/Tdarr-65e46f69.css
 %%WWWDIR%%/resources/Tdarr-e59cc5f1.js
 %%WWWDIR%%/resources/UptimeKuma-29705488.css
 %%WWWDIR%%/resources/UptimeKuma-2ea528f8.js
 %%WWWDIR%%/resources/WUD-1086378c.js
 %%WWWDIR%%/resources/WUD-5673736c.css
 %%WWWDIR%%/resources/fa-brands-400-003f1154.ttf
 %%WWWDIR%%/resources/fa-brands-400-faae6fc0.woff2
 %%WWWDIR%%/resources/fa-regular-400-7d81a1a7.ttf
 %%WWWDIR%%/resources/fa-regular-400-9169d8be.woff2
 %%WWWDIR%%/resources/fa-solid-900-886c8611.woff2
 %%WWWDIR%%/resources/fa-solid-900-cea79b34.ttf
 %%WWWDIR%%/resources/fa-v4compatibility-335fd7d9.woff2
 %%WWWDIR%%/resources/fa-v4compatibility-455e8e72.ttf
 %%WWWDIR%%/resources/index-5de1cfc6.js
 %%WWWDIR%%/resources/index-e2ec3c11.css
 %%WWWDIR%%/resources/lato-v16-latin-regular-04050bae.woff
 %%WWWDIR%%/resources/lato-v16-latin-regular-c3c0d3f4.woff2
 %%WWWDIR%%/resources/qBittorrent-bd6a2a62.css
 %%WWWDIR%%/resources/qBittorrent-eafe78f4.js
 %%WWWDIR%%/resources/raleway-v14-latin-regular-5d176856.woff
 %%WWWDIR%%/resources/raleway-v14-latin-regular-b3287a40.woff2
 %%WWWDIR%%/resources/service-56521882.js
 %%WWWDIR%%/sw.js
 %%WWWDIR%%/workbox-f948cc43.js