diff --git a/services/enabled.nix b/services/enabled.nix
index 0715c99..11132b2 100644
--- a/services/enabled.nix
+++ b/services/enabled.nix
@@ -4,7 +4,7 @@
     imports =
     [
 	    #./7dtd.nix
-        ./vaheim.nix
+#        ./vaheim.nix
         ./sshd.nix
         ./teamspeak.nix
         ./nginx.nix
diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index 57e40ed..838f28c 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -1,18 +1,25 @@
 { config, pkgs, ... }:
 let
-  myPhp = pkgs.php.buildEnv {
-    extensions = { all, ... }: with all; [ imagick opcache apcu redis memcached ];
+  myPhp = pkgs.php74.buildEnv {
+    extensions = { enabled, all }: with all; [ imagick opcache apcu redis memcached ] ++ enabled;
     extraConfig = ''
+ 	opcache.enable=1
+	opcache.enable_cli=1
+        opcache.interned_strings_buffer=8
+        opcache.max_accelerated_files=10000
+        opcache.memory_consumption=128
+        opcache.save_comments=1
+        opcache.revalidate_freq=1
 	memory_limit=5G
 	post_max_size=5G
 	upload_max_filesize=5G
 	output_buffering=0
+	apc.enable_cli=1
     '';
   };
 
 in
 {
-#    environment.systemPackages = with pkgs; [ nextcloud ];
 
     services.nginx.virtualHosts."cloud.stubbe.rocks" = {
         enableACME = true;
@@ -138,10 +145,6 @@ in
 
     users.extraUsers.nextcloud.packages = [
       myPhp
-#      pkgs.phpExtensions74.apcu
-#      pkgs.phpPackages.memcached
-#      pkgs.phpPackages.redis
-#      pkgs.phpPackages.imagick
     ];
 
     # Option I: PHP-FPM pool for Nextcloud
@@ -152,6 +155,7 @@ in
       server = "nginx";
     in
     {
+      phpPackage = myPhp;
       settings = {
         "listen" = "${phpfpmSocketName}";
         "listen.owner" = "${server}";
@@ -170,25 +174,6 @@ in
       };
   };
 
-  services.phpfpm.phpOptions = ''
-      opcache.enable=1
-      opcache.enable_cli=1
-      opcache.interned_strings_buffer=8
-      opcache.max_accelerated_files=10000
-      opcache.memory_consumption=128
-      opcache.save_comments=1
-      opcache.revalidate_freq=1
-      memory_limit=2G
-      post_max_size=2G
-      upload_max_filesize=2G
-      extension=${pkgs.php74Extensions.redis}/lib/php/extensions/redis.so
-      extension=${pkgs.php74Extensions.apcu}/lib/php/extensions/apcu.so
-      extension=${pkgs.php74Extensions.imagick}/lib/php/extensions/imagick.so
-      extension=${pkgs.php74Extensions.opcache}/lib/php/extensions/opcache.so
-      extension=${pkgs.php74Extensions.memcached}/lib/php/extensions/memcached.so
-  '';
-#  services.phpfpm.phpPackage = myPhp;
-
 services.cron.enable = true;
 
 }