diff --git a/.vscode/launch.json b/.vscode/launch.json
index 29a4231..39c3606 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -14,7 +14,7 @@
                 "/var/lib/nextcloud/server/3rdparty/sabre/vobject": "${workspaceRoot}/vobject",
                 "/var/lib/nextcloud/server": "${workspaceRoot}/server",
                 "/var/lib/nextcloud/server/apps/dav": "${workspaceRoot}/server/apps/dav",
-
+                "/var/lib/nextcloud/dev-apps/circles": "${workspaceRoot}/circles",
             },              
         }
     ]
diff --git a/calendar b/calendar
index e72d225..afb60be 160000
--- a/calendar
+++ b/calendar
@@ -1 +1 @@
-Subproject commit e72d2259dc9a624771a417725c388de1ae57872d
+Subproject commit afb60be7d579fdaab9fac66a1228f7c16ea74a0e
diff --git a/circles b/circles
index f3b38fc..e76bb81 160000
--- a/circles
+++ b/circles
@@ -1 +1 @@
-Subproject commit f3b38fc5c96ce3f0c05b4df95a718724d109f6f1
+Subproject commit e76bb81c384eecab6b36e66c277c1e835002ec54
diff --git a/server b/server
index 8cfcb8e..ab27e95 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 8cfcb8e2a2f9ba1bbe993161f00d7dcebf07708f
+Subproject commit ab27e9508b7c399e7bae77d538f873395fe1334a
diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix
index ee55ede..4c78e38 100644
--- a/vm-nextcloud.nix
+++ b/vm-nextcloud.nix
@@ -27,8 +27,8 @@
           installPhase = oldAttrs.installPhase + ''
             mkdir -p $out/
             cp -R . $out/
-            #rm -r $out/apps/firstrunwizard
-            #rm -r $out/apps/password_policy
+            rm -r $out/apps/firstrunwizard
+            rm -r $out/apps/password_policy
             rm -r $out/apps/circles
           '';
           dontBuild = true;
@@ -42,10 +42,10 @@
     enable = true;
     package = pkgs.nextcloud27;
     hostName = "localhost";
-    #extraApps = with pkgs.nextcloud27Packages.apps; {
-    #  inherit activity;
-    #};
-    #extraAppsEnable = true;
+    extraApps = with config.services.nextcloud.package.packages.apps; {
+      inherit calendar contacts;
+    };
+    extraAppsEnable = true;
     config = {
       adminuser = "admin";
       adminpassFile = "${pkgs.writeText "adminpass" "test123"}";
@@ -62,7 +62,7 @@
       "xdebug.start_with_request" = "yes";
       "xdebug.idekey" = "ECLIPSE";
     };
-    appstoreEnable = true;
+    appstoreEnable = false;
     configureRedis = true;
     caching.apcu = false;
     extraOptions = {
@@ -88,31 +88,38 @@
         "openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
         catch_workers_output = "yes";
       };
-      # apps_paths = [
-      #   {
-      #     path = "/var/lib/nextcloud/nix-apps";
-      #     url = "/nix-apps";
-      #     writeable = false;
-      #   }
-      #   {
-      #     path = "/var/lib/nextcloud/server/apps";
-      #     url = "/apps";
-      #     writeable = false;
-      #   }
-      # ];
+      apps_paths = [
+        {
+          path = "/var/lib/nextcloud/nix-apps";
+          url = "/nix-apps";
+          writable = false;
+        }
+        {
+          path = "/var/lib/nextcloud/apps";
+          url = "/apps";
+          writable = false;
+        }
+        {
+          path = "/var/lib/nextcloud/dev-apps";
+          url = "/dev-apps";
+          writable = false;
+        }
+      ];
     };
   };
   # Mount our local development repositories into the VM
   nixos-shell.mounts.extraMounts = {
-    "/var/lib/nextcloud/store-apps/circles" = {
+    "/var/lib/nextcloud/dev-apps/circles" = {
        target = ./circles;
        cache = "none";
     };
   };
-  #   "/var/lib/nextcloud/server" = {
-  #     target = ./server;
-  #     cache = "none";
-  #   };
+  #  #"/var/lib/nextcloud/server" = {
+  #  #  target = ./server;
+  #  #  cache = "none";
+  #  #};
+  #};
+  #};
   #   "/var/lib/nextcloud/server/apps/calendar" = {
   #      target = ./calendar;
   #      cache = "none";
@@ -138,7 +145,7 @@
       "10.100.100.1"
       "127.0.0.1"
     ];
-    # Disable any sender validation checks
+    # Disable any sender vhttps://github.com/obsidiansystems/ipfs-nix-guide/alidation checks
     config = lib.concatStrings (
       builtins.match "(.*)authorize_sender.*identity\n[ ]+\}(.*)" options.services.maddy.config.default
     );
@@ -177,11 +184,6 @@
       ${config.services.nextcloud.occ}/bin/nextcloud-occ user:add --password-from-env user2
       ${config.services.nextcloud.occ}/bin/nextcloud-occ user:setting user2 settings email "user2@localhost"
       ${config.services.nextcloud.occ}/bin/nextcloud-occ user:setting admin settings email "admin@localhost"
-
-      ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable calendar
-
-      rm /var/lib/nextcloud/apps
-      ln -s /var/lib/nextcloud/server/apps /var/lib/nextcloud/apps
     '';
     serviceConfig = {
       Type = "oneshot";
diff --git a/vobject b/vobject
index 198196c..ac56915 160000
--- a/vobject
+++ b/vobject
@@ -1 +1 @@
-Subproject commit 198196c9cfe436c8c0ee5637a5129a455c9bf404
+Subproject commit ac56915f9b88a99118c0ee7f25d4338798514251