diff --git a/flake.lock b/flake.lock
index ed6b3abb..6cb0a83c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -117,7 +117,7 @@
         "flake-parts": "flake-parts_2",
         "import-tree": "import-tree_2",
         "nixpkgs": [
-          "default-creds",
+          "default-creds-web",
           "nixpkgs"
         ],
         "systems": "systems_2",
@@ -138,16 +138,13 @@
       }
     },
     "default-creds": {
-      "inputs": {
-        "bun2nix": "bun2nix_2",
-        "nixpkgs": "nixpkgs_2"
-      },
+      "flake": false,
       "locked": {
-        "lastModified": 1780323652,
-        "narHash": "sha256-Ol1ygle0M95z0gOIYGD9WK4gl5xsWi7TvS7IgnK/WJQ=",
+        "lastModified": 1787774968,
+        "narHash": "sha256-hkri5ZScV47HZOYUNd4E4UpPP54i34fhfTNaso+TSuE=",
         "owner": "anotherhadi",
         "repo": "default-creds",
-        "rev": "98b207fe54e07086346f5d77c7a5ec6044e67cca",
+        "rev": "d65bf35676d0d8364fc372917aa3d60109e74fde",
         "type": "github"
       },
       "original": {
@@ -156,6 +153,25 @@
         "type": "github"
       }
     },
+    "default-creds-web": {
+      "inputs": {
+        "bun2nix": "bun2nix_2",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1787818431,
+        "narHash": "sha256-CNXlYP22cJ9pOgCnZXDWA2nX6KevbtPIbQ4mpz7Qb+Q=",
+        "owner": "anotherhadi",
+        "repo": "default-creds-web",
+        "rev": "f376048495395ec58197281fc10bfb96ecd56019",
+        "type": "github"
+      },
+      "original": {
+        "owner": "anotherhadi",
+        "repo": "default-creds-web",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -701,11 +717,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787315761,
-        "narHash": "sha256-1ze3fFnH7GhN6P3e76Ved2OGNLU/r1Pgo59TbPi9Pg8=",
+        "lastModified": 1787821287,
+        "narHash": "sha256-/Ob/9a6whpsyrksdbmMX1EQkirE+0ASelmmH6/zKwYM=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "9fd3c9b18edddb6c611fcbee9974d3b6de5443a7",
+        "rev": "f37cbf879053cce9e6d483fb977f57004273c026",
         "type": "github"
       },
       "original": {
@@ -782,6 +798,7 @@
       "inputs": {
         "blog": "blog",
         "default-creds": "default-creds",
+        "default-creds-web": "default-creds-web",
         "disko": "disko",
         "git-hooks": "git-hooks",
         "helium-browser": "helium-browser",
@@ -987,7 +1004,7 @@
     "treefmt-nix_2": {
       "inputs": {
         "nixpkgs": [
-          "default-creds",
+          "default-creds-web",
           "bun2nix",
           "nixpkgs"
         ]
diff --git a/flake.nix b/flake.nix
index 769e21c2..1e411c45 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,10 +48,14 @@
       url = "github:cachix/git-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    default-creds = {
+      url = "github:anotherhadi/default-creds";
+      flake = false;
+    };
 
     # Server
     nixarr.url = "github:nix-media-server/nixarr";
-    default-creds.url = "github:anotherhadi/default-creds";
+    default-creds-web.url = "github:anotherhadi/default-creds-web";
     blog.url = "github:anotherhadi/blog";
   };
 
diff --git a/home/programs/group/cybersecurity-packages.nix b/home/programs/group/cybersecurity-packages.nix
index 25926f1d..2adde970 100644
--- a/home/programs/group/cybersecurity-packages.nix
+++ b/home/programs/group/cybersecurity-packages.nix
@@ -1,5 +1,6 @@
 {pkgs}: (with pkgs; [
   # Web
+  pkgs.nur.repos.anotherhadi.spilltea
   dirb
   ffuf
   katana
@@ -17,24 +18,25 @@
   redis
 
   # Network
-  inetutils
   termshark # wireshark in TUI
+  wtfis # Passive hostname, domain and IP lookup tool
+  inetutils
   whois
   dig
   nmap
   samba
   hydra
+  pkgs.nur.repos.anotherhadi.revshell
 
   # Misc
   metasploit
   nuclei
   openvpn
-
-  # Secrets
-  trufflehog
+  zizmor # CI/CD Pipelines
+  trufflehog # Look for secrets
+  pkgs.nur.repos.anotherhadi.jwt-tui
+  pkgs.nur.repos.anotherhadi.default-creds-tui
 
   # Forensics
   binwalk
-  pkgs.nur.repos.anotherhadi.spilltea
-  pkgs.nur.repos.anotherhadi.jwt-tui
 ])
diff --git a/home/programs/group/cybersecurity.nix b/home/programs/group/cybersecurity.nix
index 1d6e3a64..5619ba71 100644
--- a/home/programs/group/cybersecurity.nix
+++ b/home/programs/group/cybersecurity.nix
@@ -2,6 +2,7 @@
   pkgs,
   config,
   lib,
+  inputs,
   ...
 }: {
   home.packages = import ./cybersecurity-packages.nix {
@@ -41,6 +42,8 @@
       url = "https://raw.githubusercontent.com/CarlosLannister/OwadeReborn/refs/heads/master/owade/fileAnalyze/hashcatLib/best64.rule%7E";
       hash = "sha256-T0XkMHJZQiy63/j25nGTkaiDFjc+blmgEVGTAFgVylU=";
     };
+
+    ".cache/default-creds".source = inputs.default-creds;
   };
 
   home.persistence."/persist" = lib.mkIf (config.var.impermanenceEnabled or false) {
diff --git a/hosts/server/flake.nix b/hosts/server/flake.nix
index 81848000..17b384a3 100644
--- a/hosts/server/flake.nix
+++ b/hosts/server/flake.nix
@@ -17,7 +17,7 @@ nixpkgs.lib.nixosSystem {
     inputs.sops-nix.nixosModules.sops
     inputs.nixarr.nixosModules.default
     inputs.nix-index-database.nixosModules.default
-    inputs.default-creds.nixosModules.default
+    inputs.default-creds-web.nixosModules.default
     inputs.impermanence.nixosModules.impermanence
     ./configuration.nix
   ];
diff --git a/server-modules/default-creds.nix b/server-modules/default-creds.nix
index 297baaf8..76484797 100644
--- a/server-modules/default-creds.nix
+++ b/server-modules/default-creds.nix
@@ -13,7 +13,7 @@ in {
       hostIp = "10.233.6.1";
       containerIp = "10.233.6.2";
       nixosConfig = {...}: {
-        imports = [inputs.default-creds.nixosModules.default];
+        imports = [inputs.default-creds-web.nixosModules.default];
         services.default-creds = {
           enable = true;
           port = 8087;
@@ -31,6 +31,7 @@ in {
     })
   ];
 
+  # TODO: ??
   services.default-creds.enable = lib.mkForce false;
   services.cloudflared.tunnels."${config.var.tunnelId}".ingress."default-creds.${config.var.domain}" = "http://10.233.6.2:8087";
 }