diff --git a/modules/services/drone/server/default.nix b/modules/services/drone/server/default.nix
index 1202010..0f56d29 100644
--- a/modules/services/drone/server/default.nix
+++ b/modules/services/drone/server/default.nix
@@ -7,6 +7,7 @@ in
     systemd.services.drone-server = {
       wantedBy = [ "multi-user.target" ];
       after = [ "postgresql.service" ];
+      requires = [ "postgresql.service" ];
       serviceConfig = {
         EnvironmentFile = [
           cfg.secretFile
diff --git a/modules/services/tandoor-recipes/default.nix b/modules/services/tandoor-recipes/default.nix
index d78bef3..83177c8 100644
--- a/modules/services/tandoor-recipes/default.nix
+++ b/modules/services/tandoor-recipes/default.nix
@@ -50,6 +50,7 @@ in
     systemd.services = {
       tandoor-recipes = {
         after = [ "postgresql.service" ];
+        requires = [ "postgresql.service" ];
 
         serviceConfig = {
           EnvironmentFile = cfg.secretKeyFile;
diff --git a/modules/services/woodpecker/server/default.nix b/modules/services/woodpecker/server/default.nix
index 152e707..d9f723b 100644
--- a/modules/services/woodpecker/server/default.nix
+++ b/modules/services/woodpecker/server/default.nix
@@ -12,7 +12,7 @@ in
         WOODPECKER_HOST = "https://woodpecker.${config.networking.domain}";
         WOODPECKER_DATABASE_DRIVER = "postgres";
         WOODPECKER_DATABASE_DATASOURCE = "postgres:///woodpecker?host=/run/postgresql";
-        WOODPECKER_ADMIN = "${cfg.admin}";
+        WOODPECKER_ADMIN = cfg.admin;
         WOODPECKER_SERVER_ADDR = ":${toString cfg.port}";
         WOODPECKER_GRPC_ADDR = ":${toString cfg.rpcPort}";
 
@@ -24,6 +24,9 @@ in
     };
 
     systemd.services.woodpecker-server = {
+      after = [ "postgresql.service" ];
+      requires = [ "postgresql.service" ];
+
       serviceConfig = {
         # Set username for DB access
         User = "woodpecker";