diff --git a/woodpecker/.SRCINFO b/woodpecker/.SRCINFO
index 4807c11..655bfe6 100644
--- a/woodpecker/.SRCINFO
+++ b/woodpecker/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = woodpecker
 	pkgdesc = Woodpecker is a community fork of the Drone CI system
-	pkgver = 0.15.5
+	pkgver = 0.15.0+387+gf0e518a5a
 	pkgrel = 1
 	url = https://woodpecker-ci.org
 	arch = x86_64
@@ -9,16 +9,16 @@ pkgbase = woodpecker
 	makedepends = git
 	makedepends = npm
 	options = !lto
-	source = git+https://github.com/woodpecker-ci/woodpecker.git#tag=v0.15.5
+	source = git+https://github.com/woodpecker-ci/woodpecker.git
 	source = woodpecker-server.service
 	source = woodpecker-agent.service
 	source = agent.conf
 	source = server.conf
 	sha256sums = SKIP
-	sha256sums = c83db16998062a6c6dcc0559df5b71c44d6e0f199c74b22f969399098dd57afd
+	sha256sums = 6e22e6939222aaad07311e37a086935ca32dd149c3688b2809db5f55df816516
 	sha256sums = 176d884407b89da3e83cb0b19c506a3fd5ce39a19fb6346e512562ee73e50373
-	sha256sums = 4de44e9fd4ae2b83955536fa12be94d4812706544178923c40b53b8a6dd71079
-	sha256sums = 9a90780b9bbd9596b34c0ff81d9256dba54a14d40c72de47c62c1ffd094ba217
+	sha256sums = 7bc4d8ab05573ff761f001a445207a5a9f533b4cb5cf7c538a45dceceb04d441
+	sha256sums = 71807249f898f323fac434cfa01a7af91bb442d4050ae0c955e400a4bb9edef1
 
 pkgname = woodpecker-server
 	backup = etc/woodpecker/server
diff --git a/woodpecker/PKGBUILD b/woodpecker/PKGBUILD
index 2a57151..398792a 100644
--- a/woodpecker/PKGBUILD
+++ b/woodpecker/PKGBUILD
@@ -1,10 +1,12 @@
+# Maintainer: nyyu <mail at nyyu dot dev>
+
 pkgbase=woodpecker
 pkgname=(
   'woodpecker-server'
   'woodpecker-agent'
   'woodpecker-cli'
 )
-pkgver=0.15.5
+pkgver=0.15.0+387+gf0e518a5a
 pkgrel=1
 pkgdesc="Woodpecker is a community fork of the Drone CI system"
 arch=('x86_64')
@@ -12,16 +14,21 @@ url="https://woodpecker-ci.org"
 license=('Apache')
 makedepends=('go' 'git' 'npm')
 options=('!lto')
-source=(git+https://github.com/woodpecker-ci/woodpecker.git#tag=v$pkgver
+source=(git+https://github.com/woodpecker-ci/woodpecker.git
     'woodpecker-server.service'
     'woodpecker-agent.service'
     'agent.conf'
     'server.conf')
 sha256sums=('SKIP'
-            'c83db16998062a6c6dcc0559df5b71c44d6e0f199c74b22f969399098dd57afd'
+            '6e22e6939222aaad07311e37a086935ca32dd149c3688b2809db5f55df816516'
             '176d884407b89da3e83cb0b19c506a3fd5ce39a19fb6346e512562ee73e50373'
-            '4de44e9fd4ae2b83955536fa12be94d4812706544178923c40b53b8a6dd71079'
-            '9a90780b9bbd9596b34c0ff81d9256dba54a14d40c72de47c62c1ffd094ba217')
+            '7bc4d8ab05573ff761f001a445207a5a9f533b4cb5cf7c538a45dceceb04d441'
+            '71807249f898f323fac434cfa01a7af91bb442d4050ae0c955e400a4bb9edef1')
+
+pkgver() {
+  cd "$pkgbase"
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
 
 prepare() {
     cd "$pkgbase"
@@ -108,5 +115,5 @@ package_woodpecker-cli() {
     cd "$pkgbase"
 
     # binary
-    install -vDm755 build-cli/cli "$pkgdir/usr/bin/woodpecker-cli"
+    install -vDm755 build-cli/cli "$pkgdir/usr/bin/woodpecker"
 }
diff --git a/woodpecker/server.conf b/woodpecker/server.conf
index b3884cd..c068f72 100644
--- a/woodpecker/server.conf
+++ b/woodpecker/server.conf
@@ -2,7 +2,7 @@
 
 # database configuration
 WOODPECKER_DATABASE_DRIVER=sqlite3
-WOODPECKER_DATABASE_DATASOURCE=/var/lib/woodpecker-server/woodpecker.sqlite
+WOODPECKER_DATABASE_DATASOURCE=/var/lib/woodpecker/woodpecker.sqlite
 
 # remote configuration
 WOODPECKER_GITHUB=false
@@ -30,4 +30,4 @@ WOODPECKER_REPO_OWNERS=
 WOODPECKER_OPEN=false
 
 # debug
-WOODPECKER_LOG_LEVEL=info
+WOODPECKER_LOG_LEVEL=
diff --git a/woodpecker/woodpecker-server.service b/woodpecker/woodpecker-server.service
index 2da6765..e6e0d3f 100644
--- a/woodpecker/woodpecker-server.service
+++ b/woodpecker/woodpecker-server.service
@@ -5,7 +5,7 @@ After=network-online.target
 
 
 [Service]
-User=woodpecker-server
+User=woodpecker
 Type=simple
 EnvironmentFile=/etc/woodpecker/server
 ExecStart=/usr/bin/woodpecker-server
@@ -15,7 +15,7 @@ KillSignal=SIGINT
 LimitNOFILE=8192
 PrivateDevices=yes
 DynamicUser=yes
-StateDirectory=woodpecker-server
+StateDirectory=woodpecker
 
 [Install]
 WantedBy=multi-user.target