diff --git a/lib/module/default.nix b/lib/module/default.nix
index d0b1e84..4afb956 100644
--- a/lib/module/default.nix
+++ b/lib/module/default.nix
@@ -74,6 +74,10 @@ rec {
               }
             ];
           };
+          redis.servers.${name} = lib.mkIf cfg.redis.enable {
+            enable = true;
+            port = cfg.redis.port;
+          };
         };
 
         # systemd.tmpfiles.rules = [
@@ -112,6 +116,12 @@ rec {
 
             openFirewall = mkBoolOpt true "Open the firewall";
 
+            redis = {
+              enable = lib.mkEnableOption "enable redis";
+
+              port = mkOpt types.int 80 "Port for ${name} redis to be hosted on";
+            };
+
             reverseProxy = mkReverseProxyOpt;
           }
           // options;
diff --git a/modules/nixos/services/authentik/default.nix b/modules/nixos/services/authentik/default.nix
index cfec5a8..a946f3b 100644
--- a/modules/nixos/services/authentik/default.nix
+++ b/modules/nixos/services/authentik/default.nix
@@ -23,20 +23,6 @@ let
             port = cfg.port;
           };
         };
-        redis.servers.authentik = {
-          enable = mkDefault true;
-          port = mkDefault 6379;
-        };
-      };
-
-      # Open firewall for authentik if enabled
-      networking.firewall = mkIf cfg.openFirewall {
-        allowedTCPPorts = [
-          4822
-        ];
-        allowedUDPPorts = [
-          4822
-        ];
       };
     };
   };
diff --git a/systems/x86_64-linux/jallen-nas/apps.nix b/systems/x86_64-linux/jallen-nas/apps.nix
index 292fc67..bd94371 100755
--- a/systems/x86_64-linux/jallen-nas/apps.nix
+++ b/systems/x86_64-linux/jallen-nas/apps.nix
@@ -31,6 +31,10 @@ in
         configureDb = true;
         port = 9000;
         environmentFile = "/run/secrets/jallen-nas/authentik-env";
+        redis = {
+          enable = true;
+          port = 6379;
+        };
       };
       authentikRac = {
         enable = true;