diff --git a/SPECS/openqa.spec b/SPECS/openqa.spec
index 3bcdde3..39860c0 100644
--- a/SPECS/openqa.spec
+++ b/SPECS/openqa.spec
@@ -285,8 +285,10 @@ Additional scripts for the use of openQA in the python programming language.
 
 %package local-db
 Summary:        Helper package to ease setup of postgresql DB
+Group:          Development/Tools/Other
 Requires:       %name
 Requires:       postgresql-server
+BuildRequires:  postgresql-server
 Supplements:    packageand(%name:postgresql-server)
 
 %description local-db
@@ -295,9 +297,11 @@ next to the webui.
 
 %package single-instance
 Summary:        Convenience package for a single-instance setup
+Group:          Development/Tools/Other
+Requires:       %{name} = %{version}
 Requires:       %{name}-local-db
-Requires:       %{name}-worker
-Requires:       httpd
+Requires:       %{name}-worker = %{version}
+Requires:       apache2
 
 %description single-instance
 Use this package to setup a local instance with all services provided together.
@@ -653,6 +657,9 @@ fi
 
 %files local-db
 %{_unitdir}/openqa-setup-db.service
+%{_unitdir}/openqa-gru.service.requires/postgresql.service
+%{_unitdir}/openqa-scheduler.service.requires/postgresql.service
+%{_unitdir}/openqa-websockets.service.requires/postgresql.service
 %{_datadir}/openqa/script/setup-db
 %{_bindir}/openqa-setup-db