diff --git a/modules/nixos/guests/firefly-iii/default.nix b/modules/nixos/guests/firefly-iii/default.nix
index adcec4f..9204681 100755
--- a/modules/nixos/guests/firefly-iii/default.nix
+++ b/modules/nixos/guests/firefly-iii/default.nix
@@ -72,8 +72,9 @@ in
                 encode gzip
 
                 php_fastcgi unix//run/phpfpm/firefly-iii.sock {
-                  env SERVER_NAME {http.request.header.X-Forwarded-Host}
-                  env HTTPS on
+                  env HTTP_X_FORWARDED_PROTO {http.request.header.X-Forwarded-Proto}
+                  env HTTP_X_FORWARDED_HOST {http.request.header.X-Forwarded-Host}
+                  env HTTPS {http.request.header.X-Forwarded-Proto}
                 }
               '';
             };
@@ -99,6 +100,10 @@ in
           };
         };
 
+        users.users.caddy = {
+          extraGroups = [ "firefly-iii" ];
+        };
+
         networking.firewall.allowedTCPPorts = [
           22
           80