diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 3ce9777..f7986cc 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -65,26 +65,28 @@
   };
 
   # Declare test service manually
-  services.tests-service = {
-    enable = true;
-    port = 8080;
-    default-nginx = {
-      enable = true;
-      hostname = "test.roypository.com";
-    };
-  };
+  #services.tests-service = {
+   # enable = true;
+    #port = 8080;
+    #default-nginx = {
+     # enable = true;
+      #hostname = "test.roypository.com";
+    #};
+  #};
 
   # Declare minio service manually
 
   # Grub Boot Loader Setup
-  boot.loader.grub = {
-    enable = true;
-    zfsSupport = true;
-    efiSupport = true;
-    efiInstallAsRemovable = true;
-    mirroredBoots = [
-      { devices = [ "nodev" ]; path = "/boot"; }
-    ];
+  boot.loader = {
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot/efi";
+    };
+    grub = {
+      efiSupport = true;
+      efiInstallAsRemovable = true;
+      device = "nodev";
+    };
   };
 
   # Rollback root on reboot
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 9abe63f..516f49e 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -20,11 +20,11 @@
     # This is a path to the services I've declared. 
     # It just happens to be stored in the same repository (relative), 
     # but could well be a separate repository
-    tests-service.url = "github:RoyDumblauskas/tests-service?shallow=1";
+    # tests-service.url = "github:RoyDumblauskas/tests-service?shallow=1";
     # minio-service.url = "path:../homelab-services/minio-service";
   };
 
-  outputs = { self, nixpkgs, home-manager, disko, sops-nix, quasiSecrets, impermanence, tests-service }@inputs: 
+  outputs = { self, nixpkgs, home-manager, disko, sops-nix, quasiSecrets, impermanence }@inputs: 
   let 
     nodes = [
       { 
@@ -52,7 +52,7 @@
           quasiSecrets.nixosModules.ipAddrs
           quasiSecrets.nixosModules.serviceList
           impermanence.nixosModules.impermanence
-          tests-service.nixosModules.default
+          # tests-service.nixosModules.default
           # minio-service.nixosModules.default
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;