diff --git a/apps/browser/gulpfile.js b/apps/browser/gulpfile.js
deleted file mode 100644
index ed977df4715..00000000000
--- a/apps/browser/gulpfile.js
+++ /dev/null
@@ -1,233 +0,0 @@
-const child = require("child_process");
-const fs = require("fs");
-
-const { rimraf } = require("rimraf");
-const gulp = require("gulp");
-const gulpif = require("gulp-if");
-const jeditor = require("gulp-json-editor");
-const replace = require("gulp-replace");
-
-const manifest = require("./src/manifest.json");
-const manifestVersion = parseInt(process.env.MANIFEST_VERSION || manifest.version);
-
-const paths = {
-  build: "./build/",
-  dist: "./dist/",
-  safari: "./src/safari/",
-};
-
-function buildString() {
-  var build = "";
-  if (process.env.MANIFEST_VERSION) {
-    build = `-mv${process.env.MANIFEST_VERSION}`;
-  }
-  if (process.env.BUILD_NUMBER && process.env.BUILD_NUMBER !== "") {
-    build = `-${process.env.BUILD_NUMBER}`;
-  }
-  return build;
-}
-
-function distFileName(browserName, ext) {
-  return `dist-${browserName}${buildString()}.${ext}`;
-}
-
-async function dist(browserName, manifest) {
-  const { default: zip } = await import("gulp-zip");
-
-  return gulp
-    .src(paths.build + "**/*")
-    .pipe(gulpif("popup/index.html", replace("__BROWSER__", "browser_" + browserName)))
-    .pipe(gulpif("manifest.json", jeditor(manifest)))
-    .pipe(zip(distFileName(browserName, "zip")))
-    .pipe(gulp.dest(paths.dist));
-}
-
-function distFirefox() {
-  return dist("firefox", (manifest) => {
-    if (manifestVersion === 3) {
-      const backgroundScript = manifest.background.service_worker;
-      delete manifest.background.service_worker;
-      manifest.background.scripts = [backgroundScript];
-    }
-    delete manifest.storage;
-    delete manifest.sandbox;
-    manifest.optional_permissions = manifest.optional_permissions.filter(
-      (permission) => permission !== "privacy",
-    );
-    return manifest;
-  });
-}
-
-function distOpera() {
-  return dist("opera", (manifest) => {
-    delete manifest.applications;
-
-    // Mv3 on Opera does seem to have sidebar support, however it is not working as expected.
-    // On install, the extension will crash the browser entirely if the sidebar_action key is set.
-    // We will remove the sidebar_action key for now until opera implements a fix.
-    if (manifestVersion === 3) {
-      delete manifest.sidebar_action;
-      delete manifest.commands._execute_sidebar_action;
-    }
-
-    return manifest;
-  });
-}
-
-function distChrome() {
-  return dist("chrome", (manifest) => {
-    delete manifest.applications;
-    delete manifest.sidebar_action;
-    delete manifest.commands._execute_sidebar_action;
-    return manifest;
-  });
-}
-
-function distEdge() {
-  return dist("edge", (manifest) => {
-    delete manifest.applications;
-    delete manifest.sidebar_action;
-    delete manifest.commands._execute_sidebar_action;
-    return manifest;
-  });
-}
-
-function distSafariMas(cb) {
-  return distSafariApp(cb, "mas");
-}
-
-function distSafariMasDev(cb) {
-  return distSafariApp(cb, "masdev");
-}
-
-function distSafariDmg(cb) {
-  return distSafariApp(cb, "dmg");
-}
-
-function distSafariApp(cb, subBuildPath) {
-  const buildPath = paths.dist + "Safari/" + subBuildPath + "/";
-  const builtAppexPath = buildPath + "build/Release/safari.appex";
-  const builtAppexFrameworkPath = buildPath + "build/Release/safari.appex/Contents/Frameworks/";
-  const entitlementsPath = paths.safari + "safari/safari.entitlements";
-  var args = [
-    "--verbose",
-    "--force",
-    "-o",
-    "runtime",
-    "--sign",
-    "Developer ID Application: 8bit Solutions LLC",
-    "--entitlements",
-    entitlementsPath,
-  ];
-  if (subBuildPath !== "dmg") {
-    args = [
-      "--verbose",
-      "--force",
-      "--sign",
-      subBuildPath === "mas"
-        ? "3rd Party Mac Developer Application: Bitwarden Inc"
-        : "E7C9978F6FBCE0553429185C405E61F5380BE8EB",
-      "--entitlements",
-      entitlementsPath,
-    ];
-  }
-
-  return rimraf([buildPath + "**/*"], { glob: true })
-    .then(() => safariCopyAssets(paths.safari + "**/*", buildPath))
-    .then(() => safariCopyBuild(paths.build + "**/*", buildPath + "safari/app"))
-    .then(() => {
-      const proc = child.spawn("xcodebuild", [
-        "-project",
-        buildPath + "desktop.xcodeproj",
-        "-alltargets",
-        "-configuration",
-        "Release",
-      ]);
-      stdOutProc(proc);
-      return new Promise((resolve) => proc.on("close", resolve));
-    })
-    .then(async () => {
-      const libs = fs
-        .readdirSync(builtAppexFrameworkPath)
-        .filter((p) => p.endsWith(".dylib"))
-        .map((p) => builtAppexFrameworkPath + p);
-      const libPromises = [];
-      libs.forEach((i) => {
-        const proc = child.spawn("codesign", args.concat([i]));
-        stdOutProc(proc);
-        libPromises.push(new Promise((resolve) => proc.on("close", resolve)));
-      });
-      return Promise.all(libPromises);
-    })
-    .then(() => {
-      const proc = child.spawn("codesign", args.concat([builtAppexPath]));
-      stdOutProc(proc);
-      return new Promise((resolve) => proc.on("close", resolve));
-    })
-    .then(
-      () => {
-        return cb;
-      },
-      () => {
-        return cb;
-      },
-    );
-}
-
-function safariCopyAssets(source, dest) {
-  return new Promise((resolve, reject) => {
-    gulp
-      .src(source)
-      .on("error", reject)
-      .pipe(gulpif("safari/Info.plist", replace("0.0.1", manifest.version)))
-      .pipe(
-        gulpif("safari/Info.plist", replace("0.0.2", process.env.BUILD_NUMBER || manifest.version)),
-      )
-      .pipe(gulpif("desktop.xcodeproj/project.pbxproj", replace("../../../build", "../safari/app")))
-      .pipe(gulp.dest(dest))
-      .on("end", resolve);
-  });
-}
-
-async function safariCopyBuild(source, dest) {
-  return new Promise((resolve, reject) => {
-    gulp
-      .src(source)
-      .on("error", reject)
-      .pipe(gulpif("popup/index.html", replace("__BROWSER__", "browser_safari")))
-      .pipe(
-        gulpif(
-          "manifest.json",
-          jeditor((manifest) => {
-            if (manifestVersion === 3) {
-              const backgroundScript = manifest.background.service_worker;
-              delete manifest.background.service_worker;
-              manifest.background.scripts = [backgroundScript];
-            }
-            delete manifest.sidebar_action;
-            delete manifest.commands._execute_sidebar_action;
-            delete manifest.optional_permissions;
-            manifest.permissions.push("nativeMessaging");
-            return manifest;
-          }),
-        ),
-      )
-      .pipe(gulp.dest(dest))
-      .on("end", resolve);
-  });
-}
-
-function stdOutProc(proc) {
-  proc.stdout.on("data", (data) => console.log(data.toString()));
-  proc.stderr.on("data", (data) => console.error(data.toString()));
-}
-
-exports["dist:firefox"] = distFirefox;
-exports["dist:chrome"] = distChrome;
-exports["dist:opera"] = distOpera;
-exports["dist:edge"] = distEdge;
-exports["dist:safari"] = gulp.parallel(distSafariMas, distSafariMasDev, distSafariDmg);
-exports["dist:safari:mas"] = distSafariMas;
-exports["dist:safari:masdev"] = distSafariMasDev;
-exports["dist:safari:dmg"] = distSafariDmg;
-exports.dist = gulp.parallel(distFirefox, distChrome, distOpera, distEdge);
diff --git a/apps/browser/scripts/dist.ps1 b/apps/browser/scripts/dist.ps1
index 3f687586172..7c75794fa9c 100755
--- a/apps/browser/scripts/dist.ps1
+++ b/apps/browser/scripts/dist.ps1
@@ -22,8 +22,8 @@ if (-not $browser) {
     }
 }
 
-$buildDir = Join-Path $PSScriptRoot "..\build"
-$distDir = Join-Path $PSScriptRoot "..\dist"
+$buildDir = Join-Path $PSScriptRoot "../build"
+$distDir = Join-Path $PSScriptRoot "../dist"
 
 Write-Output $PSScriptRoot
 
@@ -50,3 +50,97 @@ if ($browser -ne 'safari') {
         Write-Output "Zipped $buildDir into $distPath"
     }
 }
+else {
+    $subBuildPaths = @("mas", "masdev", "dmg")
+    $safariSrc = Join-Path $PSScriptRoot "../src/safari"
+    $safariDistPath = Join-Path -Path $distDir -ChildPath "Safari"
+
+    if (-not (Test-Path $safariDistPath)) {
+        New-Item -ItemType Directory -Path $safariDistPath
+    }
+
+    # Delete old safari dists
+    Remove-Item -LiteralPath $safariDistPath -Force -Recurse
+
+
+    foreach ($subBuildPath in $subBuildPaths) {
+        $safariBuildPath = Join-Path -Path $safariDistPath -ChildPath $subBuildPath
+        $builtAppexPath = Join-Path -Path $safariBuildPath -ChildPath "build/Release/safari.appex"
+        $builtAppexFrameworkPath = Join-Path -Path $safariBuildPath -ChildPath "build/Release/safari.appex/Contents/Frameworks/"
+        $entitlementsPath = Join-Path -Path $safariSrc -ChildPath "safari/safari.entitlements"
+
+        switch ($subBuildPath) {
+            "mas" {
+                $codesignArgs = @(
+                    "--verbose",
+                    "--force",
+                    "--sign",
+                    "3rd Party Mac Developer Application: Bitwarden Inc",
+                    "--entitlements",
+                    $entitlementsPath
+                )
+            }
+            "masdev" {
+                $codesignArgs = @(
+                    "--verbose",
+                    "--force",
+                    "--sign",
+                    "E7C9978F6FBCE0553429185C405E61F5380BE8EB",
+                    "--entitlements",
+                    $entitlementsPath
+                )
+            }
+            "dmg" {
+                $codesignArgs = @(
+                    "--verbose",
+                    "--force",
+                    "-o",
+                    "runtime",
+                    "--sign",
+                    "Developer ID Application: 8bit Solutions LLC",
+                    "--entitlements",
+                    $entitlementsPath
+                )
+            }
+        }
+
+        # Copy safari src
+        Copy-Item -Path $safariSrc -Destination $safariBuildPath -Recurse
+
+        # Copy build
+        $target = Join-Path -Path $safariBuildPath -ChildPath "safari/app"
+        Copy-Item -Path $buildDir -Destination $target -Recurse
+
+        # Update versions
+        $jsonFilePath = Join-Path $buildDir "manifest.json"
+        $jsonContent = Get-Content -Path $jsonFilePath -Raw
+        $jsonObject = $jsonContent | ConvertFrom-Json
+
+        $infoFile = Join-Path -Path $safariBuildPath -ChildPath "safari/Info.plist"
+        (Get-Content $infoFile).Replace('0.0.1', $jsonObject.version).Replace('0.0.2', $jsonObject.version) | Set-Content $infoFile
+
+        $projectFile = Join-Path -Path $safariBuildPath -ChildPath "desktop.xcodeproj/project.pbxproj"
+        (Get-Content $projectFile).Replace('../../../build', "../safari/app") | Set-Content $projectFile
+
+        # Build using xcode
+        $xcodeBuildArgs = @(
+            "-project",
+            (Join-Path $safariBuildPath "desktop.xcodeproj"),
+            "-alltargets",
+            "-configuration",
+            "Release"
+        )
+        $proc = Start-Process "xcodebuild" -ArgumentList $xcodeBuildArgs -NoNewWindow -PassThru
+        $proc.WaitForExit()
+
+        # Codesign
+        $libs = Get-ChildItem -Path $builtAppexFrameworkPath -Filter "*.dylib"
+        foreach ($lib in $libs) {
+            $proc = Start-Process "codesign" -ArgumentList ($codesignArgs + $lib.FullName) -NoNewWindow -PassThru
+            $proc.WaitForExit()
+        }
+
+        $proc = Start-Process "codesign" -ArgumentList ($codesignArgs + $builtAppexPath) -NoNewWindow -PassThru
+        $proc.WaitForExit()
+    }
+}