diff --git a/Makefile b/Makefile
index 5fda076..5702cf8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,13 @@
 all:
+	git submodule update --init
+	cd server && git submodule update --init
+	cd server && make dev-setup
+	cd server && make build-js
+	cd server && npm run sass
+
+clean:
+	rm nixos.qcow2
+
+
+run:
 	QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::5877-:587" nixos-shell vm-nextcloud.nix
diff --git a/README.md b/README.md
index 10af4f7..16a38b1 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,16 @@
-To run development environment simply execute
+Build test environment
+
 ```
 git clone https://github.com/onny/nixos-nextcloud-testumgebung.git
 cd nixos-nextcloud-testumgebung
-git submodule update --init
 nix develop
 make
 ```
-on NixOS :)
+
+Run virtual machine
+
+```
+make run
+```
+
+Requires NixOS :)
diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix
index 78aef12..85ab1d0 100644
--- a/vm-nextcloud.nix
+++ b/vm-nextcloud.nix
@@ -6,11 +6,15 @@
         # Remove first run wizard and password policy check from Nextcloud
         # package
         nextcloud25 = super.nextcloud25.overrideAttrs (oldAttrs: rec {
+          patches = [];
           src = ./server;
           installPhase = oldAttrs.installPhase + ''
-            rm -r $out/apps/firstrunwizard
-            rm -r $out/apps/password_policy
+            mkdir -p $out/
+            cp -R . $out/
+            #rm -r $out/apps/firstrunwizard
+            #rm -r $out/apps/password_policy
           '';
+          dontBuild = true;
         });
       })
     ];