diff --git a/README.md b/README.md
index 5d5789c..654e83b 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,9 @@ This is a work-in-progress and currently is not production ready. Please check b
   - [x] Install Passbolt
   - [x] Install Pterodactyl Panel
   - [x] Install Immich
-  - [ ] Restore Forgejo
-  - [ ] Restore Passbolt
+  - [ ] Install Synapse
+  - [x] Restore Forgejo
+  - [x] Restore Passbolt
   - [ ] Restore Pterodactyl Panel
   - [ ] Restore Immich (difficult!)
   - [ ] Get myself a treat :3
diff --git a/hosts/andromeda/stacks/forgejo/docker-compose.nix b/hosts/andromeda/stacks/forgejo/docker-compose.nix
index a761228..2ef3bee 100644
--- a/hosts/andromeda/stacks/forgejo/docker-compose.nix
+++ b/hosts/andromeda/stacks/forgejo/docker-compose.nix
@@ -91,7 +91,7 @@
       "FORGEJO__service__REQUIRE_CAPTCHA_FOR_LOGIN" = "true";
       "FORGEJO__service__MCAPTCHA_URL" = "https://mcaptcha.terah.dev";
       "FORGEJO__service__CAPTCHA_TYPE" = "mcaptcha";
-      "FORGEJO__service__ENABLE_CAPTCHA" = "false";
+      "FORGEJO__service__ENABLE_CAPTCHA" = "true";
       "FORGEJO__service__REGISTER_MANUAL_CONFIRM" = "true";
       "FORGEJO__service__REQUIRE_EXTERNAL_REGISTRATION_CAPTCHA" = "true";
       "USER_GID" = "1000";
@@ -122,7 +122,7 @@
 
   systemd.services."docker-forgejo-server" = {
     serviceConfig = {
-      Restart = lib.mkOverride 90 "always";
+      Restart = lib.mkOverride 90 "unless-stopped";
       RestartMaxDelaySec = lib.mkOverride 90 "1m";
       RestartSec = lib.mkOverride 90 "100ms";
       RestartSteps = lib.mkOverride 90 9;
diff --git a/hosts/andromeda/stacks/passbolt/docker-compose.nix b/hosts/andromeda/stacks/passbolt/docker-compose.nix
index d886fec..f6f7217 100644
--- a/hosts/andromeda/stacks/passbolt/docker-compose.nix
+++ b/hosts/andromeda/stacks/passbolt/docker-compose.nix
@@ -27,7 +27,7 @@
 
   systemd.services."docker-passbolt-db" = {
     serviceConfig = {
-      Restart = lib.mkOverride 90 "always";
+      Restart = lib.mkOverride 90 "unless-stopped";
       RestartMaxDelaySec = lib.mkOverride 90 "1m";
       RestartSec = lib.mkOverride 90 "100ms";
       RestartSteps = lib.mkOverride 90 9;
@@ -77,7 +77,7 @@
 
   systemd.services."docker-passbolt-passbolt" = {
     serviceConfig = {
-      Restart = lib.mkOverride 90 "always";
+      Restart = lib.mkOverride 90 "unless-stopped";
       RestartMaxDelaySec = lib.mkOverride 90 "1m";
       RestartSec = lib.mkOverride 90 "100ms";
       RestartSteps = lib.mkOverride 90 9;
diff --git a/hosts/andromeda/stacks/pterodactyl/docker-compose.nix b/hosts/andromeda/stacks/pterodactyl/docker-compose.nix
index 4bd32e5..d12e353 100644
--- a/hosts/andromeda/stacks/pterodactyl/docker-compose.nix
+++ b/hosts/andromeda/stacks/pterodactyl/docker-compose.nix
@@ -18,7 +18,7 @@
 
   systemd.services."docker-pterodactyl-cache" = {
     serviceConfig = {
-      Restart = lib.mkOverride 90 "always";
+      Restart = lib.mkOverride 90 "unless-stopped";
       RestartMaxDelaySec = lib.mkOverride 90 "1m";
       RestartSec = lib.mkOverride 90 "100ms";
       RestartSteps = lib.mkOverride 90 9;
@@ -58,7 +58,7 @@
 
   systemd.services."docker-pterodactyl-database" = {
     serviceConfig = {
-      Restart = lib.mkOverride 90 "always";
+      Restart = lib.mkOverride 90 "unless-stopped";
       RestartMaxDelaySec = lib.mkOverride 90 "1m";
       RestartSec = lib.mkOverride 90 "100ms";
       RestartSteps = lib.mkOverride 90 9;
@@ -116,7 +116,7 @@
 
   systemd.services."docker-pterodactyl-panel" = {
     serviceConfig = {
-      Restart = lib.mkOverride 90 "always";
+      Restart = lib.mkOverride 90 "unless-stopped";
       RestartMaxDelaySec = lib.mkOverride 90 "1m";
       RestartSec = lib.mkOverride 90 "100ms";
       RestartSteps = lib.mkOverride 90 9;