diff --git a/common/linux.nix b/common/linux.nix
index 6ad081f..51add21 100644
--- a/common/linux.nix
+++ b/common/linux.nix
@@ -32,6 +32,8 @@
 
   time.timeZone = "America/Toronto";
 
+  services.opensnitch.enable = true;
+
   sound.enable = true;
 
   # Enable 32bit for steam
diff --git a/common/opensnitch/default.nix b/common/opensnitch/default.nix
deleted file mode 100644
index fda9a9e..0000000
--- a/common/opensnitch/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-{
-  systemd = {
-    services = {
-      opensnitch = {
-        description = "Opensnitch Application Firewall Daemon";
-        wants = [ "network.target" ];
-        after = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
-        path = [ pkgs.iptables ];
-        serviceConfig = {
-          Type = "simple";
-          PermissionsStartOnly = true;
-          ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /etc/opensnitch/rules";
-          ExecStart = "${pkgs.opensnitch}/bin/opensnitchd -rules-path /etc/opensnitch/rules";
-          Restart = "always";
-          RestartSec = 30;
-        };
-        enable = true;
-      };
-    };
-  };
-
-}
diff --git a/common/packages.nix b/common/packages.nix
index 3e7a764..d899fb9 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -185,8 +185,6 @@ in
         libreoffice
         linuxPackages.perf
         networkmanager-openvpn
-        opensnitch
-        opensnitch-ui
         pinentry-curses
         pulseeffects-pw
         qemu
diff --git a/flake.nix b/flake.nix
index 50df2a5..cd970b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,7 +29,6 @@
           ./common/fonts.nix
           ./common/linux.nix
           ./common/netdata/default.nix
-          ./common/opensnitch/default.nix
           ./common/networking.nix
           ./common/packages.nix
           ./common/printing.nix
diff --git a/home/default.nix b/home/default.nix
index 37e6127..492eb5f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -34,6 +34,8 @@ in
     };
   };
 
+  services.opensnitch-ui.enable = true;
+
   fonts.fontconfig.enable = true;
 
   programs = {