diff --git a/common/dotfiles/firefox.nix b/common/dotfiles/firefox.nix
index 3eb67965..6df1136d 100644
--- a/common/dotfiles/firefox.nix
+++ b/common/dotfiles/firefox.nix
@@ -1,45 +1,39 @@
 { config, pkgs, ... }: {
   programs.firefox = {
     enable = true;
-    package = pkgs.firefox.override {
-      cfg = {
-        CaptivePortal = false;
-        DisableFirefoxStudies = true;
-        DisablePocket = true;
-        DisableTelemetry = true;
-        DisableFirefoxAccounts = false;
-        NoDefaultBookmarks = true;
-        OfferToSaveLogins = false;
-        OfferToSaveLoginsDefault = false;
-        PasswordManagerEnabled = false;
-        FirefoxHome = {
-          Search = true;
-          Pocket = false;
-          Snippets = false;
-          TopSites = false;
-          Highlights = false;
-        };
-        UserMessaging = {
-          ExtensionRecommendations = false;
-          SkipOnboarding = true;
-        };
-      };
-    };
-
     profiles.default = {
       isDefault = true;
       name = "default";
       settings = {
+        "extension.pocket.enabled" = "false";
+        "toolkit.telemetry.pioneer-new-studies-availble" = "false";
+        "datareporting.healthreport.uploadEnabled" = "false";
+        "datareporting.healthreport.infoURL" = "null";
+        "toolkit.telemetry.server" = "null";
+        "browser.newtabpage.activity-stream.feeds.telemetry" = "false";
+        "browser.newtabpage.activity-stream.telemetry" = "false";
+        "browser.ping-centre.telemetry" = "false";
+        "toolkit.telemetry.enabled" = "false";
+        "toolkit.telemetry.firstShutdownPing.enabled" = "false";
+        "toolkit.telemetry.hybridContent.enabled" = "false";
+        "toolkit.telemetry.newProfilePing.enabled" = "false";
+        "toolkit.telemetry.shutdownPingSender.enabled" = "false";
+        "toolkit.telemetry.updatePing.enabled" = "false";
+        "toolkit.telemetry.reportingpolicy.firstRun" = "false";
+        "toolkit.telemetry.unified" = "false";
+        "toolkit.telemetry.archive.enabled" = "false";
+        "devtools.onboarding.telemetry.logged" = "false";
+        "toolkit.telemetry.bhrPing.enabled" = "false";
+        "datareporting.policy.dataSubmissionEnabled" = "false";
+        "datareporting.sessions.current.clean" = "true";
         "browser.startup.homepage" = "https://searx.sysctl.io";
         "browser.search.region" = "US";
         "browser.search.isUS" = false;
         "distribution.searchplugins.defaultLocale" = "en-US";
         "general.useragent.locale" = "en-US";
-        "browser.bookmarks.showMobileBookmarks" = false;
-        "browser.newtabpage.pinned" = [{
-          title = "Blank";
-          url = "about:blank";
-        }];
+        "browser.bookmarks.showMobileBookmarks" = "false";
+        "browser.newtabpage.enabled" = "false";
+        "services.sync.prefs.sync.browser.newtabpage.enabled" = "false";
       };
       search.default = "DuckDuckGo";
       search.force = true;
diff --git a/flake.lock b/flake.lock
index 07d60a81..86180ed9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -122,6 +122,21 @@
         "type": "github"
       }
     },
+    "moz_overlay": {
+      "locked": {
+        "lastModified": 1687771476,
+        "narHash": "sha256-TSpqz6qYVRoqkEdOCawEQ4/cWt/4pracmvw17HK1tgE=",
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "3a44b8783514e7d6db4b63df96071b6c2b014b07",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1688109178,
@@ -188,6 +203,7 @@
       "inputs": {
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
+        "moz_overlay": "moz_overlay",
         "nixpkgs": "nixpkgs"
       }
     },
diff --git a/flake.nix b/flake.nix
index 4066b446..a76e3324 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,11 +16,13 @@
     # Secureboot Configuration
     lanzaboote.url = "github:nix-community/lanzaboote";
     lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
+
+    # Firefox Overlay
+    moz_overlay.url = "github:mozilla/nixpkgs-mozilla";
   };
 
-  outputs = { nixpkgs, home-manager, lanzaboote, ... }@inputs:
+  outputs = { nixpkgs, home-manager, lanzaboote, moz_overlay, ... }@inputs:
   let
-
     # Variables - Remember to set these
     hostname = "nixos-laptop";
     system = "x86_64-linux";
@@ -46,7 +48,7 @@
 
           # SecureBoot Configuration
           lanzaboote.nixosModules.lanzaboote
-
+          
           # Common NixOS Configuration file
           ./configuration.nix
 
@@ -56,9 +58,13 @@
             home-manager.useUserPackages = true;
             home-manager.users.albert = import ./users/albert/home.nix;
             home-manager.users.root = import ./users/root/home.nix;
+            # nixpkgs overlays
+            nixpkgs.overlays = [
+              moz_overlay.overlay
+            ];
           }
         ]; # modules
       }; # lib.nixosSystem - nixos-laptop
     }; # nixosConfiguration
   };
-}
\ No newline at end of file
+}