diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile
index d081103d869c..2a5fc35b4ca0 100644
--- a/security/vaultwarden/Makefile
+++ b/security/vaultwarden/Makefile
@@ -1,55 +1,54 @@
 PORTNAME=	vaultwarden
 DISTVERSION=	1.29.1
 PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Bitwarden compatible backend server
 WWW=		https://github.com/dani-garcia/vaultwarden
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS+=	libcapnp.so:devel/capnproto \
 		libgmp.so:math/gmp \
 		libnettle.so:security/nettle
 
 USES=		cargo mysql:client pgsql ssl
 
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 USE_GITHUB=	yes
 GH_ACCOUNT=	dani-garcia
 USE_RC_SUBR=	${PORTNAME}
 
+USERS=		${WWWOWN}
+GROUPS=		${WWWGRP}
+PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+
 OPTIONS_DEFINE=	WEBVAULT
 OPTIONS_DEFAULT=WEBVAULT
 
 WEBVAULT_DESC=	Vaultwarden web (bw_web_builds)
 
 WEBVAULT_RUN_DEPENDS=	${WWWDIR}/web-vault/index.html:www/vaultwarden-web_vault
 
 # make cargo-crates > Makefile.crates
 
 CARGO_FEATURES=	mysql postgresql sqlite #vendored_openssl
 #CARGO_ENV+=	RUSTC_BOOTSTRAP=1
 
 INSTALL_TARGET=	install-strip
 
-SUB_FILES=	pkg-message
 SUB_LIST=	WWWGRP=${WWWGRP} \
 		WWWOWN=${WWWOWN}
 
 #post-patch:
 #	${REINPLACE_CMD} 's/^rust-version = "1.60"/rust-version = "1.59"/' \
 #		${WRKSRC}/Cargo.toml
 
 post-install:
-	${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d
-	${INSTALL} -m0600 ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample
 	${MKDIR} ${STAGEDIR}/${WWWDIR}/data
-	${ECHO_CMD} \
-		'@postexec chown -R ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/data' \
-		>> ${TMPPLIST}
+	${INSTALL} -m0600 ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${WWWDIR}/data/config.json.sample
 
 .include <bsd.port.mk>
diff --git a/security/vaultwarden/files/pkg-message.in b/security/vaultwarden/files/pkg-message.in
deleted file mode 100644
index 7f2614605175..000000000000
--- a/security/vaultwarden/files/pkg-message.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-
-Setup vaultwarden environment:
-
-Copy %%PREFIX%%/etc/rc.conf.d/vaultwarden.sample to  %%PREFIX%%/etc/rc.conf.d/vaultwarden
-
-Adapt %%PREFIX%%/etc/rc.conf.d/vaultwarden to your needs.
-
-Enable and start vaultwarden service
-EOM
-}
-]
diff --git a/security/vaultwarden/pkg-plist b/security/vaultwarden/pkg-plist
index a70f701414d3..a3b7fa646df8 100644
--- a/security/vaultwarden/pkg-plist
+++ b/security/vaultwarden/pkg-plist
@@ -1,4 +1,3 @@
 bin/vaultwarden
-etc/rc.conf.d/vaultwarden.sample
-@dir %%ETCDIR%%/rc.conf.d
-@dir %%WWWDIR%%/data
+@dir(%%WWWOWN%%,%%WWWGRP%%,0755) %%WWWDIR%%/data
+@sample %%WWWDIR%%/data/config.json.sample