diff --git a/cron/APKBUILD-cron.common b/cron/APKBUILD-cron.common
new file mode 100644
index 0000000..4d08b1c
--- /dev/null
+++ b/cron/APKBUILD-cron.common
@@ -0,0 +1,8 @@
+pkgname="redxen-cron-$_cronname"
+pkgdesc="Cronjob files for $_cronname"
+url="https://git.redxen.eu/RedXen/aports"
+arch="noarch"
+license="none"
+depends="dcron"
+options="!check"
+builddir="$srcdir"
diff --git a/cron/mail/APKBUILD b/cron/dovecot/APKBUILD
similarity index 65%
rename from cron/mail/APKBUILD
rename to cron/dovecot/APKBUILD
index d7dec2c..04dee23 100644
--- a/cron/mail/APKBUILD
+++ b/cron/dovecot/APKBUILD
@@ -1,18 +1,13 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-cron-mail
-pkgver=2021.01.13
-pkgrel=1
-pkgdesc="Mail backup maintenance scripts"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+_cronname=dovecot
+
+. ../APKBUILD-cron.common
+
+pkgver=2021.01.29
+pkgrel=0
 install_if="redxen-config-dovecot"
-depends="dcron"
-source="
-	cron-daily
-"
-options="!check"
+source="cron-daily"
 
 package() {
 	mkdir -p "$pkgdir"/var/mail/snapshots
diff --git a/cron/mail/cron-daily b/cron/dovecot/cron-daily
similarity index 100%
rename from cron/mail/cron-daily
rename to cron/dovecot/cron-daily
diff --git a/cron/gitea/APKBUILD b/cron/gitea/APKBUILD
index 46ff9a4..854575c 100644
--- a/cron/gitea/APKBUILD
+++ b/cron/gitea/APKBUILD
@@ -1,18 +1,13 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-cron-gitea
-pkgver=2020.12.27
-pkgrel=1
-pkgdesc="Gitea backup maintenance scripts"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+_cronname=gitea
+
+. ../APKBUILD-cron.common
+
+pkgver=2021.01.29
+pkgrel=0
 install_if="redxen-config-gitea"
-depends="dcron"
-source="
-	cron-daily
-"
-options="!check"
+source="cron-daily"
 
 package() {
 	install -dm700 "$pkgdir"/gitea/snapshots
diff --git a/cron/influxdb/APKBUILD b/cron/influxdb/APKBUILD
index dfd9e7d..70c1bcb 100644
--- a/cron/influxdb/APKBUILD
+++ b/cron/influxdb/APKBUILD
@@ -1,18 +1,13 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-cron-influxdb
-pkgver=2020.12.29
+_cronname=influxdb
+
+. ../APKBUILD-cron.common
+
+pkgver=2021.01.29
 pkgrel=0
-pkgdesc="InfluxDB backup maintenance scripts"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
 install_if="redxen-config-influxdb"
-depends="dcron"
-source="
-	cron-daily
-"
-options="!check"
+source="cron-daily"
 
 package() {
 	install -dm700 "$pkgdir"/var/lib/influxdb/snapshots
diff --git a/cron/postgresql/APKBUILD b/cron/postgresql/APKBUILD
index e0df73c..52f335c 100644
--- a/cron/postgresql/APKBUILD
+++ b/cron/postgresql/APKBUILD
@@ -1,18 +1,13 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-cron-postgresql
-pkgver=2020.12.29
+_cronname=postgresql
+
+. ../APKBUILD-cron.common
+
+pkgver=2021.01.29
 pkgrel=0
-pkgdesc="Postgresql backup maintenance scripts"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
 install_if="redxen-config-postgresql"
-depends="dcron"
-source="
-	cron-daily
-"
-options="!check"
+source="cron-daily"
 
 package() {
 	install -dm700 "$pkgdir"/var/lib/postgresql/redxen_snapshots
diff --git a/cron/redis/APKBUILD b/cron/redis/APKBUILD
index 8102f86..a05454c 100644
--- a/cron/redis/APKBUILD
+++ b/cron/redis/APKBUILD
@@ -1,18 +1,13 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-cron-redis
-pkgver=2020.12.29
+_cronname=redis
+
+. ../APKBUILD-cron.common
+
+pkgver=2021.01.29
 pkgrel=0
-pkgdesc="Redis backup maintenance scripts"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
 install_if="redxen-config-redis"
-depends="dcron"
-source="
-	cron-daily
-"
-options="!check"
+source="cron-daily"
 
 package() {
 	install -dm700 "$pkgdir"/var/lib/redis/snapshots