diff --git a/modules/features/forgejo.nix b/modules/features/forgejo.nix
index 03fd61f..8919093 100644
--- a/modules/features/forgejo.nix
+++ b/modules/features/forgejo.nix
@@ -149,7 +149,8 @@
 
         systemd.services.forgejo-pocket-id-oidc = lib.mkIf cfg.pocketId.enable {
           description = "Ensure Pocket ID OIDC auth source exists in Forgejo";
-          after = [ "forgejo.service" ];
+          after = [ "forgejo.service" "network-online.target" ];
+          wants = [ "network-online.target" ];
           requires = [ "forgejo.service" ];
           wantedBy = [ "multi-user.target" ];
 
@@ -158,6 +159,9 @@
             User = config.services.forgejo.user;
             Group = config.services.forgejo.group;
             WorkingDirectory = config.services.forgejo.stateDir;
+            Restart = "on-failure";
+            RestartSec = "30s";
+            StartLimitIntervalSec = 0;
           };
 
           script = ''