diff --git a/devel/gitea-act_runner/Makefile b/devel/gitea-act_runner/Makefile
index 664984d85392..71a9305ffea4 100644
--- a/devel/gitea-act_runner/Makefile
+++ b/devel/gitea-act_runner/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	act_runner
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	gitea-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Act runner is a runner for Gitea based on Gitea fork of act
 WWW=		https://gitea.com/gitea/act_runner
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=	go:modules
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MODULE=	gitea.com/gitea/act_runner
 
 DATADIR=	/var/db/${PORTNAME}
 
 USERS=	${ACT_RUNNER_USER}
 GROUPS=	${ACT_RUNNER_GROUP}
 
 ACT_RUNNER_USER?=	${PORTNAME}
 ACT_RUNNER_GROUP?=	${PORTNAME}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/internal/pkg/config/config.example.yaml ${STAGEDIR}${ETCDIR}/act_runner.conf.sample
 
 .include <bsd.port.mk>
diff --git a/devel/gitea-act_runner/files/act_runner.in b/devel/gitea-act_runner/files/act_runner.in
index fa243278cc7e..119b92aca300 100644
--- a/devel/gitea-act_runner/files/act_runner.in
+++ b/devel/gitea-act_runner/files/act_runner.in
@@ -1,52 +1,54 @@
 #!/bin/sh
 
 # PROVIDE: act_runner
 # REQUIRE: NETWORKING SYSLOG
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable act_runner:
 #
 # act_runner_enable (bool):   Set to "NO" by default.
 #                       Set it to "YES" to enable act_runner.
 
 . /etc/rc.subr
 
 name="act_runner"
 rcvar="act_runner_enable"
 
 load_rc_config "${name}"
 
 : ${act_runner_user:="act_runner"}
 : ${act_runner_enable:="NO"}
 : ${act_runner_facility:="daemon"}
 : ${act_runner_priority:="debug"}
 : ${act_runner_config:="%%ETCDIR%%/act_runner.conf"}
 : ${act_runner_cache_dir:="%%DATADIR%%"}
 : ${act_runner_log_dir:="/var/log/act_runner"}
 : ${act_runner_log_file:="${act_runner_log_dir}/act_runner.log"}
 : ${act_runner_flags:="-c ${act_runner_config} daemon"}
 
 procname="%%PREFIX%%/bin/act_runner"
-command="${procname} ${act_runner_flags}"
+command="/usr/sbin/daemon"
 
 pidfile="/var/run/${name}.pid"
 
-start_cmd="${name}_start"
-sig_stop=KILL
+required_files=${act_runner_config}
+command_args=" -r -S -l ${act_runner_facility} -s ${act_runner_priority} \
+    -T ${name} \
+    -u ${act_runner_user} -p ${pidfile} \
+    -o ${act_runner_log_file} \
+    ${procname} ${act_runner_flags}"
 
-act_runner_start() {
+prestart_cmd="${name}_prestart"
+sig_stop=TERM
+
+act_runner_prestart() {
   #  ensure the log directories are owned by the unprivileged user
   for d in "${act_runner_log_dir}"; do
     if [ ! -e "$d" ]; then
       mkdir "$d"
       chown "${act_runner_user}" "$d"
     fi
   done
-  /usr/sbin/daemon -S -l "${act_runner_facility}" -s "${act_runner_priority}" \
-    -T "${name}" \
-    -u "${act_runner_user}" -p "${pidfile}" \
-    -o "${act_runner_log_file}" \
-    $command
 }
 
 run_rc_command "$1"