diff --git a/hosts/Alaska/containers/nextcloud.nix b/hosts/Alaska/containers/nextcloud.nix
index cf283bb..a3a2397 100644
--- a/hosts/Alaska/containers/nextcloud.nix
+++ b/hosts/Alaska/containers/nextcloud.nix
@@ -10,45 +10,88 @@
     localAddress = "192.168.100.11";
     hostAddress6 = "fc00::1";
     localAddress6 = "fc00::2";
-    bindMounts = {
-      "/nextcloud" = {
+
+    # allowed filepaths and container-internal mount points
+     bindMounts = {
+      "/Aurora/nextcloud" = {
         hostPath = "/Aurora/nextcloud";
         isReadOnly = false;
       };
     };
 
-    config = { config, pkgs, ... }: {
+     # If, when you nix-container root-login and systemctl status nextcloud-setup says the
+     # password files are unreadable, log in as root and `chown nextcloud:nextcloud` the password files
+  config = { config, pkgs, ... }: {
 
+    # A lot of this nextcloud configuration was pulled from this post:
+    # https://jacobneplokh.com/how-to-setup-nextcloud-on-nixos/
       services.nextcloud = {
         enable = true;
         package = pkgs.nextcloud25;
+        enableBrokenCiphersForSSE = false;
+
+        #nginx.enable = true;
+        #https = true;
         hostName = "192.168.100.10";
+        home = "/Aurora/nextcloud";
+
+        autoUpdateApps = {
+          enable = true;
+          startAt = "05:00:00";
+        };
 
         config = {
+          #overwriteProtocal = "https";
           extraTrustedDomains = [
             "10.0.0.206"
           ];
-          #adminpassFile = "${pkgs.writeText "adminpass" (builtins.readFile ~/nextcloud-admin-password)}";
-          adminpassFile = "/nextcloud/nextcloud-admin-password";
+
+          dbtype = "pgsql";
+          dbuser = "nextcloud";
+          dbhost = "/run/postgresql";
+          dbname = "nextcloud";
+          dbpassFile = "/Aurora/nextcloud/nextcloud-db-password";
+
+          # This doesn't seem to be working, see this documation:
+          # https://docs.nextcloud.com/server/latest/admin_manual/configuration_user/reset_admin_password.html
+          adminpassFile = "/Aurora/nextcloud/nextcloud-admin-password";
+          adminuser = "admin";
         };
-
-        home = "/nextcloud";
-        datadir = "/nextcloud";
-
-        enableBrokenCiphersForSSE = false;
       };
 
-      system.stateVersion = "22.05";
+      services.postgresql = {
+        enable = true;
+        ensureDatabases = [ "nextcloud" ];
+        ensureUsers = [
+          {
+              name = "nextcloud";
+              ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
+          }
+        ];
+        authentication = lib.mkForce ''
+          # TYPE  DATABASE        USER            ADDRESS                 METHOD
+          local   all             all                                     trust
+          host    all             all             127.0.0.1/32            trust
+          host    all             all             ::1/128                 trust
+          '';
+      };
 
+      # Make sure PostSQL is running before nextcloud
+      systemd.services."nextcloud-setup" = {
+          requires = ["postgresql.service"];
+          after = ["postgresql.service"];
+      };
+
+
+      # Container nixos state configurations
+      system.stateVersion = "22.05";
       networking.firewall = {
         enable = true;
         allowedTCPPorts = [ 80 ];
       };
-
       # Manually configure nameserver. Using resolved inside the container seems to fail
       # currently
       environment.etc."resolv.conf".text = "nameserver 8.8.8.8";
-
     };
   };
 }
diff --git a/hosts/Alaska/default.nix b/hosts/Alaska/default.nix
index 9722f06..14428c2 100644
--- a/hosts/Alaska/default.nix
+++ b/hosts/Alaska/default.nix
@@ -6,23 +6,9 @@
   imports = [ 
     (import ./hardware-configuration.nix)
     (import ./containers/nextcloud.nix)
+    (import ./modules/nginx.nix)
   ];
 
-
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "nicholasyoungsumner@gmail.com";
-  };
-
-  services.nginx = {
-    enable = false;
-    virtualHosts."10.0.0.206" = {
-      addSSL = true;
-      enableACME = true;
-      root = "/var/www/test.com";
-    };
-  };
-
   environment.systemPackages = [
     pkgs.mdadm
   ];
@@ -58,6 +44,7 @@
   };
   systemd.services.sshd.wantedBy = [ "multi-user.target" ];
 
+  boot.initrd.services.swraid.mdadmConf = builtins.readFile ./rsrcs/mdadm.conf;
   boot.loader = {
     systemd-boot.enable = true;
     efi = {
@@ -66,12 +53,10 @@
     };
   };
 
-  boot.initrd.services.swraid.mdadmConf = builtins.readFile ./rsrcs/mdadm.conf;
 
   programs.msmtp = {
     enable = true;
   };
-
   environment.etc."mdadm.conf".text = ''
     MAILADDR nicholasyoungsumner@gmail.com
     '';
diff --git a/hosts/Alaska/modules/nginx.nix b/hosts/Alaska/modules/nginx.nix
new file mode 100644
index 0000000..49793e1
--- /dev/null
+++ b/hosts/Alaska/modules/nginx.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "nicholasyoungsumner@gmail.com";
+  };
+
+  services.nginx = {
+    enable = false;
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+
+    virtualHosts."10.0.0.206" = {
+      addSSL = true;
+      forceSSL = true;
+      enableACME = true;
+    };
+  };
+}