diff --git a/dev-vcs/gitlab-ci-runner/Manifest b/dev-vcs/gitlab-ci-runner/Manifest
index 555b07f..3f7ea62 100644
--- a/dev-vcs/gitlab-ci-runner/Manifest
+++ b/dev-vcs/gitlab-ci-runner/Manifest
@@ -1,4 +1,4 @@
 AUX gitlab-ci-runner-5.0.0-fix-gemfile.patch 1099 SHA256 80dddabf6c0abf0096a9ba54fe5d4f7408f47c624429ff5ac2bc19afe99b5461 SHA512 208db66cb21e467656a798f8954c474a614d3de406601806e906edbafbacafef7670f2913eae43d897be38bef1f26c70cf2a33901d0667dff4f1b1b89643f08d WHIRLPOOL 5b6e4eabc1d3a7e3320cf4616d9890c221ff306aa246aaefe8b87c9e6a631ebe7c658435225f7e546d34ce21ada063a016dad5080208765879211d2a1df7a26a
-AUX gitlab-ci-runner.init 1554 SHA256 eb6623a0fea6cbcaff936ad62bbff0974cc30307889249ad253097af0ab87760 SHA512 bc91b7ec5490432006609effe3aa0c95aef570aef91e195301f87b858317cdf250681024186b4226eb87518aaabe83c354637c20253098cbabb82effe72e9898 WHIRLPOOL d8d17b659b16d17c81dc607feda9b85b3fb8485635e528653ea5cea94008da06681b1b8fbe50d76ce4fdf2b5ec0768ece622dc7477d45ee30c5985c17cdc90c3
+AUX gitlab-ci-runner.init 1551 SHA256 83bb581255db1a8bfdf15627ce4d3166e3fab6725a36086a51ab6a69c4b0536a SHA512 d0af95f32af62c6b8758a29af831fbf80310381446c76bac795c767f5c2d6d04ead5329a8c0cc3b0624d83ea500bc48edef288073297b1060eb4df5b7856033c WHIRLPOOL 7fcb1ef8d15742a9800e43496e2802f66e8805510f40e685b7f1ef20ae23bb8d2389480acb11386cff1223ada7981e2a5d9ddaeb4d32fe4d74f88583f55c5311
 DIST gitlab-ci-runner-5.0.0.tar.gz 11846 SHA256 7d7f97894ba5ffeb4f06aa8a62d1ec17c2a1cbf84efd20418d74ccfc0f18c1e5 SHA512 cee02d144f37840b215a9cf706a3ca8239fbd2f33561b783b1abfd9ebdfd2eb323ecb57b8545d08f17c50a24e237053c505257279940cef2dce60f160364875f WHIRLPOOL d79a53553221715d3a34a18bce88af5fdf02e162afb1c0ca7212707f2672e0e30f584513ac9a1b7a6b9c46b3695762fd04e2819903b05504b5f482e0047dc337
-EBUILD gitlab-ci-runner-5.0.0.ebuild 6341 SHA256 5a75df702cd2c2b1a738e4f65ee1de91e23086d24ba29c818f94db948f0cef6c SHA512 791eefb23f2db7d2fed5c490ad97604ad400a3364e03ac7de4e2623a4598c2a3605ba2453ebd1ef6960fd917f2ba108e9c56bc1c0508efbfb0a4a2331d903309 WHIRLPOOL db7205b39847194ccc21908a2c508819a7ef907605af49674af1d640296eff3d4c250a79d9c759f4d76a0b886d90a2125eef7f92eda91db75a74bb4d918cbf08
+EBUILD gitlab-ci-runner-5.0.0.ebuild 5334 SHA256 0e8e75e7a273fbcda15341b537740d31b46f0623261a9173c4a0806babbf140b SHA512 3e7ba656f694ea4cd13d48185ec1833e82221f73e11320cf40b43a447a8b4bde23c7fc8f3892bdc044c61b85d9333bba1a1431218015cf89b80e2d135d8a3069 WHIRLPOOL 9c6dd4a01023a493d16886bd03cb8d416375eafcfee878284bd5cf27035a905573dfc1ce0e33f0cc5a61570dba06368d3f39365609f8cfd7dae8b844cac6e077
diff --git a/dev-vcs/gitlab-ci-runner/files/gitlab-ci-runner.init b/dev-vcs/gitlab-ci-runner/files/gitlab-ci-runner.init
index 3ae695c..21a12e7 100644
--- a/dev-vcs/gitlab-ci-runner/files/gitlab-ci-runner.init
+++ b/dev-vcs/gitlab-ci-runner/files/gitlab-ci-runner.init
@@ -29,7 +29,7 @@ start() {
 			--make-pidfile \
 			--pidfile="${pidfile}" \
 			--background \
-			--startas /bin/bash -- -c "exec ${bundle_command} ${bundle_command_args} >> ${gitlab_ci_runner_logfile} 2>&1"
+			--exec /bin/bash -- -c "exec ${bundle_command} ${bundle_command_args} >> ${gitlab_ci_runner_logfile} 2>&1"
 		local success=$?
 		if [ ${success}!=0 ] ; then
 			eend ${success}
diff --git a/dev-vcs/gitlab-ci-runner/gitlab-ci-runner-5.0.0.ebuild b/dev-vcs/gitlab-ci-runner/gitlab-ci-runner-5.0.0.ebuild
index 3e6dd95..8622df3 100644
--- a/dev-vcs/gitlab-ci-runner/gitlab-ci-runner-5.0.0.ebuild
+++ b/dev-vcs/gitlab-ci-runner/gitlab-ci-runner-5.0.0.ebuild
@@ -136,31 +136,9 @@ all_ruby_install() {
 
 pkg_postinst() {
 	elog
-	elog "1. Configure your GitLab CI's settings in ${CONF_DIR}/application.yml."
-	elog
-	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
-	elog "   for \"production\" environment."
-	elog
-	elog "3. Adjust the webserver settings in ${CONF_DIR}/unicorn.rb"
-	elog
-	elog "4. Then you should create a database for your GitLab CI instance, if you"
-	elog "haven't done so already."
-	elog
-	if use postgres; then
-        elog "If you have local PostgreSQL running, just copy&run:"
-        elog "      su postgres"
-        elog "      psql -c \"CREATE ROLE gitlab_ci PASSWORD 'gitlab_ci' \\"
-        elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
-        elog "      createdb -E UTF-8 -O gitlab_ci gitlab_ci_production"
-		elog "  Note: You should change your password to something more random..."
-		elog
-	fi
-	elog "4. Finally execute the following command to initlize environment:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "   Note: Do not forget to start Redis server first!"
-	elog
-	elog "If this is an update from previous version, it's HIGHLY recommended"
-	elog "to backup your database before running the config phase!"
+	elog "If this is a fresh install of GitLab CI Runner, please configure it"
+	elog "with the following command:"
+	elog "        emerge --config \"=${CATEGORY}/${PF}\""
 }
 
 pkg_config() {