diff --git a/gitea.container b/gitea.container
index 950919f..9b8fdb3 100644
--- a/gitea.container
+++ b/gitea.container
@@ -12,6 +12,7 @@ Environment=USER=git
 Environment=USER_UID=1000
 Environment=USER_GID=1000
 Environment=HOME=/var/lib/gitea/git
+Ulimit=nofile=65536:65536
 Notify=healthy
 HealthCmd=curl --fail --silent --output /dev/null http://localhost:3000/api/healthz
 HealthInterval=30s
diff --git a/gitea.spec b/gitea.spec
index e1ad0dc..50fa5e0 100644
--- a/gitea.spec
+++ b/gitea.spec
@@ -1,6 +1,6 @@
 Name:           gitea
 Version:        28.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gitea - Git with a cup of tea
 License:        MIT
 Group:          System Environment/Base
@@ -102,6 +102,9 @@ install -d -m 750 %{buildroot}%{_sharedstatedir}/gitea/data/git/repositories
 install -d -m 750 %{buildroot}%{_sharedstatedir}/gitea/data/git/lfs
 install -d -m 750 %{buildroot}%{_sharedstatedir}/gitea/log
 
+# Service and container subpackages: systemd drop-in template for extra dependencies
+install -p -D -m 644 %{SOURCE19} %{buildroot}%{_sysconfdir}/systemd/system/gitea.service.d/database.conf
+
 # Service subpackage
 install -p -D -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/gitea.service
 install -p -D -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/ssh/sshd_config.d/50-gitea.conf
@@ -118,9 +121,8 @@ install -p -D -m 440 %{SOURCE26} %{buildroot}%{_sysconfdir}/sudoers.d/gitea
 
 # PostgreSQL subpackage
 install -d -m 750 %{buildroot}%{_sharedstatedir}/gitea/postgresql
-install -p -D -m 644 %{SOURCE19} %{buildroot}%{_sysconfdir}/containers/systemd/gitea.service.d/database.conf
 install -p -D -m 644 %{SOURCE21} %{buildroot}%{_datadir}/containers/systemd/gitea-db.container
-install -p -D -m 644 %{SOURCE23} %{buildroot}%{_datadir}/containers/systemd/gitea.container.d/database.conf
+install -p -D -m 644 %{SOURCE23} %{buildroot}%{_unitdir}/gitea.service.d/gitea-db.conf
 install -p -D -m 644 %{SOURCE27} %{buildroot}%{_sysconfdir}/containers/systemd/gitea-db.container.d/credentials.conf
 
 %pre
@@ -180,6 +182,8 @@ fi
 %{_libexecdir}/gitea
 %ghost %{_bindir}/gitea
 %attr(0644,root,root) %{_unitdir}/gitea.service
+%dir %{_sysconfdir}/systemd/system/gitea.service.d
+%config(noreplace) %{_sysconfdir}/systemd/system/gitea.service.d/database.conf
 %config(noreplace) %{_sysconfdir}/ssh/sshd_config.d/50-gitea.conf
 %{_datadir}/containers/systemd/gitea-db.container.d/publish.conf
 
@@ -190,6 +194,8 @@ fi
 %config(noreplace) %{_sysconfdir}/ssh/sshd_config.d/50-gitea.conf
 %{_datadir}/containers/systemd/gitea.container
 %{_datadir}/containers/systemd/gitea.pod
+%dir %{_sysconfdir}/systemd/system/gitea.service.d
+%config(noreplace) %{_sysconfdir}/systemd/system/gitea.service.d/database.conf
 %dir %{_sysconfdir}/containers/systemd/gitea.pod.d
 %config(noreplace) %{_sysconfdir}/containers/systemd/gitea.pod.d/enable.conf
 %attr(0755,root,root) %{_libexecdir}/gitea-keys
@@ -200,17 +206,21 @@ fi
 %files postgresql
 %defattr(-,root,root,-)
 %dir %attr(0750,git,git) %{_sharedstatedir}/gitea/postgresql
-# For -service: systemd drop-in adding postgresql.service dependency
-%dir %{_sysconfdir}/containers/systemd/gitea.service.d
-%config(noreplace) %{_sysconfdir}/containers/systemd/gitea.service.d/database.conf
-# For -container: gitea-db container + drop-in wiring it to gitea
+# gitea-db container + systemd drop-in wiring it to gitea.service
 %{_datadir}/containers/systemd/gitea-db.container
-%dir %{_datadir}/containers/systemd/gitea.container.d
-%config(noreplace) %{_datadir}/containers/systemd/gitea.container.d/database.conf
+%dir %{_unitdir}/gitea.service.d
+%{_unitdir}/gitea.service.d/gitea-db.conf
 %dir %{_sysconfdir}/containers/systemd/gitea-db.container.d
 %config(noreplace) %{_sysconfdir}/containers/systemd/gitea-db.container.d/credentials.conf
 
 %changelog
+* Thu Oct 29 2026 Zoran Pericic <zpericic@netst.org> - 28.2.0-2
+- Add Ulimit=nofile=65536:65536 to gitea.container
+- Ship gitea.service.d/database.conf dependency template in /etc/systemd/system
+  with both -service and -container (was in unread /etc/containers/systemd)
+- Install gitea-db dependency as %{_unitdir}/gitea.service.d/gitea-db.conf in
+  -postgresql instead of a quadlet drop-in under /usr/share/containers/systemd
+
 * Tue Oct 20 2026 Zoran Pericic <zpericic@netst.org> - 28.2.0-1
 - Update to 28.2.0
 - Bump gitea-db PostgreSQL image to 18.6-trixie