diff --git a/apps/loadkey.nix b/apps/loadkey.nix
index c02de30..0b2fad1 100644
--- a/apps/loadkey.nix
+++ b/apps/loadkey.nix
@@ -1,4 +1,4 @@
-{ globals, pkgs, ... }: {
+{ pkgs, ... }: {
 
   type = "app";
 
diff --git a/hosts/oracle/default.nix b/hosts/oracle/default.nix
index 0af38e9..7e0d90b 100644
--- a/hosts/oracle/default.nix
+++ b/hosts/oracle/default.nix
@@ -27,7 +27,6 @@ nixpkgs.lib.nixosSystem {
     ../common.nix
     ../../modules/nixos
     ../../modules/hardware/server.nix
-    ../../modules/services/oracle.nix
     ../../modules/services/sshd.nix
     ../../modules/services/calibre.nix
     ../../modules/services/jellyfin.nix
diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix
index eec26cc..d737f34 100644
--- a/modules/services/caddy.nix
+++ b/modules/services/caddy.nix
@@ -25,6 +25,9 @@ in {
 
     };
 
+    networking.firewall.allowedTCPPorts = [ 80 443 ];
+    networking.firewall.allowedUDPPorts = [ 443 ];
+
   };
 
 }
diff --git a/modules/services/calibre.nix b/modules/services/calibre.nix
index 38b794c..b21c3de 100644
--- a/modules/services/calibre.nix
+++ b/modules/services/calibre.nix
@@ -37,8 +37,6 @@ in {
       }];
     }];
 
-    networking.firewall.interfaces.calibre = { allowedTCPPorts = [ 80 443 ]; };
-
     # Create directory and set permissions
     system.activationScripts.calibreLibrary.text = ''
       if [ ! -d "${libraryPath}" ]; then
diff --git a/modules/services/oracle.nix b/modules/services/oracle.nix
deleted file mode 100644
index 99cee98..0000000
--- a/modules/services/oracle.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-
-  # Needs to be run at boot for Oracle firewall
-  systemd.services.openIpTables = {
-    script = "${pkgs.iptables}/bin/iptables -I INPUT -j ACCEPT";
-    wantedBy = [ "multi-user.target" ];
-  };
-
-}