diff --git a/configuration-nas.nix b/configuration-nas.nix
index 74508dc..a1d075d 100644
--- a/configuration-nas.nix
+++ b/configuration-nas.nix
@@ -20,6 +20,8 @@ in
       ./nas-apps/radarr.nix
       ./nas-apps/sabnzbd.nix
       ./nas-apps/mariadb.nix
+      ./nas-apps/nextcloud.nix
+      ./nas-apps/collabora.nix
     ];
 
   # Enable nix flakes and nix-command tools
diff --git a/nas-apps/collabora.nix b/nas-apps/collabora.nix
new file mode 100644
index 0000000..51e0d9a
--- /dev/null
+++ b/nas-apps/collabora.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+{
+  # code
+  virtualisation.oci-containers.containers."collabora" = {
+    autoStart = true;
+    image = "collabora/code";
+    ports = [ "9980:9980" ];
+  };
+}
diff --git a/nas-apps/mariadb.nix b/nas-apps/mariadb.nix
index 5b22403..c75e82f 100644
--- a/nas-apps/mariadb.nix
+++ b/nas-apps/mariadb.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  # sonarr
+  # mariadb
   virtualisation.oci-containers.containers."mariadb" = {
     autoStart = true;
     image = "linuxserver/mariadb";
@@ -14,7 +14,7 @@
         TZ = "America/Chicago";
         MYSQL_ROOT_PASSWORD = "BogieDudie1";
         MYSQL_DATABASE = "jallen_nextcloud";
-        MYSQL_USER = "mjallen";
+        MYSQL_USER = "nextcloud";
         MYSQL_PASSWORD = "BogieDudie1";
     };
   };
diff --git a/nas-apps/nextcloud.nix b/nas-apps/nextcloud.nix
new file mode 100644
index 0000000..2a60101
--- /dev/null
+++ b/nas-apps/nextcloud.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, ... }:
+{
+  # nextcloud
+  virtualisation.oci-containers.containers."nextcloud" = {
+    autoStart = true;
+    image = "linuxserver/nextcloud";
+    ports = [ "9443:443" ];
+    volumes = [
+        "/mnt/Safe\ SSD/ssd_app_data/nextcloud:/config"
+        "/mnt/Main\ Pool/Nextcloud:/data"
+    ];
+    environment = {
+        PUID = "911";
+        PGID = "1000";
+        TZ = "America/Chicago";
+    };
+  };
+}
diff --git a/nas-apps/vscode.nix b/nas-apps/vscode.nix
new file mode 100644
index 0000000..8e1e7a7
--- /dev/null
+++ b/nas-apps/vscode.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    (vscode-with-extensions.override {
+      vscodeExtensions = with vscode-extensions; [
+        bbenoist.nix
+        ms-python.python
+        ms-azuretools.vscode-docker
+        ms-vscode-remote.remote-ssh
+      ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+        {
+          name = "remote-ssh-edit";
+          publisher = "ms-vscode-remote";
+          version = "0.47.2";
+          sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
+        }
+      ];
+    })
+  ];
+}