diff --git a/flake.lock b/flake.lock
index 06d1c63..cad127e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1193,11 +1193,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-mrfMvef+tOYMK35horTWF43tQpES1zI7hb5RbzN3oIk=",
-        "path": "/nix/store/d0zc8mjjmdva9rl39kdw697p1vd6kp11-source/home-manager",
+        "path": "/nix/store/gllsqnrdvnpj069qqs11zhy0z3zav8gw-source/home-manager",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/d0zc8mjjmdva9rl39kdw697p1vd6kp11-source/home-manager",
+        "path": "/nix/store/gllsqnrdvnpj069qqs11zhy0z3zav8gw-source/home-manager",
         "type": "path"
       }
     },
@@ -1807,11 +1807,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=",
-        "path": "/nix/store/hdwra9h524gn8ag3i5akm0a9q0sb7qh8-source/programs",
+        "path": "/nix/store/4vhvs85gwq4fvn8b63bjq5salkrxljl2-source/programs",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/hdwra9h524gn8ag3i5akm0a9q0sb7qh8-source/programs",
+        "path": "/nix/store/4vhvs85gwq4fvn8b63bjq5salkrxljl2-source/programs",
         "type": "path"
       }
     },
@@ -1882,11 +1882,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=",
-        "path": "/nix/store/hdwra9h524gn8ag3i5akm0a9q0sb7qh8-source/services/sddm",
+        "path": "/nix/store/4vhvs85gwq4fvn8b63bjq5salkrxljl2-source/services/sddm",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/hdwra9h524gn8ag3i5akm0a9q0sb7qh8-source/services/sddm",
+        "path": "/nix/store/4vhvs85gwq4fvn8b63bjq5salkrxljl2-source/services/sddm",
         "type": "path"
       }
     },
@@ -1976,12 +1976,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xWEC+I3fCAhwzk52HJbltXC3t9pnFYSIPHIwv7RSxao=",
-        "path": "/nix/store/d0zc8mjjmdva9rl39kdw697p1vd6kp11-source/system-config",
+        "narHash": "sha256-TdQ04dDlIQsSBNB5mCvye+gVe3E2EK63DXeQ/vMVeCk=",
+        "path": "/nix/store/gllsqnrdvnpj069qqs11zhy0z3zav8gw-source/system-config",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/d0zc8mjjmdva9rl39kdw697p1vd6kp11-source/system-config",
+        "path": "/nix/store/gllsqnrdvnpj069qqs11zhy0z3zav8gw-source/system-config",
         "type": "path"
       }
     },
diff --git a/system-config/services/containers/nextcloud/default.nix b/system-config/services/containers/nextcloud/default.nix
index 000619c..2d39f2a 100644
--- a/system-config/services/containers/nextcloud/default.nix
+++ b/system-config/services/containers/nextcloud/default.nix
@@ -11,33 +11,6 @@
 
     config = lib.mkIf config.sysconfig.opts.virtualization.nextcloud.enable {
 
-        /*services.nginx.virtualHosts."localhost".listen = [ { addr = "0.0.0.0"; port = 8081; } ];
-        services.nextcloud = {
-            enable = true;
-            package = pkgs.nextcloud30;
-            hostName = "localhost";
-            config = {
-                adminpassFile = config.sops.secrets."nextcloud/pass".path;
-                adminuser = "root";
-                dbtype = "mysql";
-            };
-            https = true;
-            datadir = "/ssd1/Nextcloud/data";
-            home = "/ssd1/Nextcloud/nextcloud_home";
-            appstoreEnable = true;
-            extraApps = with config.services.nextcloud.package.packages.apps; {
-                inherit mail contacts calendar tasks user_oidc;
-            };
-            extraAppsEnable = true;
-            settings = {
-                overwriteprotocol = "https";
-                trusted_domains = [ "nextcloud.blunkall.us" "dummy.blunkall.us" ];
-                trusted_proxies = [ "192.168.100.11" ];
-                default_phone_region = "US";
-            };
-            database.createLocally = true;
-        };*/
-
         containers.nextcloud = {
 
             autoStart = true;
@@ -60,10 +33,6 @@
 
             config = { config, lib, pkgs, ... }: {
 
-                /*systemd.tmpfiles.rules = [
-                    "Z /etc/nextcloud - nextcloud nextcloud"
-                ];*/
-
                 systemd.services.secrets_setup = {
                     wantedBy = [ "nextcloud-setup.service" ];
 
@@ -94,7 +63,13 @@
                     home = "/var/lib/nextcloud";
                     #appstoreEnable = true;
                     extraApps = with config.services.nextcloud.package.packages.apps; {
-                        inherit mail contacts calendar tasks user_oidc;
+                        inherit mail contacts calendar tasks user_oidc; 
+                        inherit impersonate end_to_end_encryption notes spreed music memories phonetrack;
+                        maps = pkgs.fetchNextcloudApp {
+                            sha256 = "sha256-seGhUw6+YfoyoBtFtOBUYbJrjRaW7ey9D6QdKu0pmOE=";
+                            url = "https://github.com/nextcloud/maps/releases/download/v1.5.0-1-nightly/maps-1.5.0-1-nightly.tar.gz";
+                            license = "agpl3Plus";
+                        };
                     };
                     extraAppsEnable = true;
                     settings = {