diff --git a/build/npm/v2-jf/init.js b/build/npm/v2-jf/init.js
index f613f592e..6a4dd7e2d 100644
--- a/build/npm/v2-jf/init.js
+++ b/build/npm/v2-jf/init.js
@@ -1,10 +1,10 @@
 validateNpmVersion();
 
-const https = require('https');
-const http = require('http');
-const url = require('url');
-const fs = require('fs');
-const packageJson = require('./package.json');
+const {get} = require("https");
+const {request} = require("http");
+const {URL} = require("url");
+const {createWriteStream, chmodSync} = require("fs");
+const packageJson = require("./package.json");
 const fileName = getFileName();
 const filePath = "bin/" + fileName;
 const version = packageJson.version;
@@ -14,52 +14,77 @@ downloadCli();
 
 function validateNpmVersion() {
     if (!isValidNpmVersion()) {
-        throw new Error("JFrog CLI can be installed using npm version 5.0.0 or above.");
+        throw new Error(
+            "JFrog CLI can be installed using npm version 5.0.0 or above."
+        );
     }
 }
 
 function downloadWithProxy(myUrl) {
-    const proxyparts = url.parse(process.env.https_proxy);
-    const myUrlParts = url.parse(myUrl);
+    const proxyparts = new URL(process.env.https_proxy);
+    const myUrlParts = new URL(myUrl);
 
-    http.request({
+    request({
         host: proxyparts.hostname,
         port: proxyparts.port,
-        method: 'CONNECT',
-        path: myUrlParts.hostname + ':443'
-    }).on('connect', function(res, socket, head) {
-        https.get({
-            host: myUrlParts.hostname,
-            socket: socket,
-            path: myUrlParts.path,
-            agent: false
-        }, function(res) {
-            if (res.statusCode === 301 || res.statusCode === 302) {
-                downloadWithProxy(res.headers.location);
-            } else if (res.statusCode === 200) {
-                writeToFile(res);
-            } else {
-                console.log('Unexpected status code ' + res.statusCode + ' during JFrog CLI download');
-            }
-        }).on('error', function (err) {console.error(err);});
-    }).end();
+        method: "CONNECT",
+        path: myUrlParts.hostname + ":443",
+    })
+        .on("connect", function (res, socket, head) {
+            get(
+                {
+                    host: myUrlParts.hostname,
+                    socket: socket,
+                    path: myUrlParts.path,
+                    agent: false,
+                },
+                function (res) {
+                    if (res.statusCode === 301 || res.statusCode === 302) {
+                        downloadWithProxy(res.headers.location);
+                    } else if (res.statusCode === 200) {
+                        writeToFile(res);
+                    } else {
+                        console.log(
+                            "Unexpected status code " +
+                            res.statusCode +
+                            " during JFrog CLI download"
+                        );
+                    }
+                }
+            ).on("error", function (err) {
+                console.error(err);
+            });
+        })
+        .end();
 }
 
 function download(url) {
-    https.get(url, function(res) {
+    get(url, function (res) {
         if (res.statusCode === 301 || res.statusCode === 302) {
             download(res.headers.location);
         } else if (res.statusCode === 200) {
             writeToFile(res);
         } else {
-            console.log('Unexpected status code ' + res.statusCode + ' during JFrog CLI download');
+            console.log(
+                "Unexpected status code " +
+                res.statusCode +
+                " during JFrog CLI download"
+            );
         }
-    }).on('error', function (err) {console.error(err);});
+    }).on("error", function (err) {
+        console.error(err);
+    });
 }
 
 function downloadCli() {
-    console.log("Downloading JFrog CLI " + version );
-    const startUrl = 'https://releases.jfrog.io/artifactory/jfrog-cli/v2-jf/' + version + '/' + pkgName + '/' + fileName;
+    console.log("Downloading JFrog CLI " + version);
+    const startUrl =
+        "https://releases.jfrog.io/artifactory/jfrog-cli/v2-jf/" +
+        version +
+        "/" +
+        pkgName +
+        "/" +
+        fileName;
     // We detect outbound proxy by looking at the environment variable
     if (process.env.https_proxy && process.env.https_proxy.length > 0) {
         downloadWithProxy(startUrl);
@@ -69,7 +94,7 @@ function downloadCli() {
 }
 
 function isValidNpmVersion() {
-    const child_process = require('child_process');
+    const child_process = require("child_process");
     const npmVersionCmdOut = child_process.execSync("npm version -json");
     const npmVersion = JSON.parse(npmVersionCmdOut).npm;
     // Supported since version 5.0.0
@@ -77,45 +102,48 @@ function isValidNpmVersion() {
 }
 
 function writeToFile(response) {
-    const file = fs.createWriteStream(filePath);
-    response.on('data', function (chunk) {
-        file.write(chunk);
-    }).on('end', function () {
-        file.end();
-        if (!process.platform.startsWith("win")) {
-            fs.chmodSync(filePath, 555);
-        }
-    }).on('error', function (err) {
-        console.error(err);
+    const file = createWriteStream(filePath);
+    response
+        .on("data", function (chunk) {
+            file.write(chunk);
+        })
+        .on("end", function () {
+            file.end();
+            if (!process.platform.startsWith("win")) {
+                chmodSync(filePath, 755);
+            }
+        })
+        .on("error", function (err) {
+            console.error(err);
     });
 }
 
 function getArchitecture() {
     const platform = process.platform;
-    if (platform.startsWith('win')) {
+    if (platform.startsWith("win")) {
         // Windows architecture:
-        return 'windows-amd64';
+        return "windows-amd64";
     }
     const arch = process.arch;
-    if (platform.includes('darwin')) {
+    if (platform.includes("darwin")) {
         // macOS architecture:
-        return arch === 'arm64' ? 'mac-arm64' : 'mac-386';
+        return arch === "arm64" ? "mac-arm64" : "mac-386";
     }
 
     // linux architecture:
     switch (arch) {
-        case 'x64':
-            return 'linux-amd64';
-        case 'arm64':
-            return 'linux-arm64';
-        case 'arm':
-            return 'linux-arm';
-        case 's390x':
-            return 'linux-s390x';
-        case 'ppc64':
-            return 'linux-ppc64';
+        case "x64":
+            return "linux-amd64";
+        case "arm64":
+            return "linux-arm64";
+        case "arm":
+            return "linux-arm";
+        case "s390x":
+            return "linux-s390x";
+        case "ppc64":
+            return "linux-ppc64";
         default:
-            return 'linux-386';
+            return "linux-386";
     }
 }
 
diff --git a/build/npm/v2/init.js b/build/npm/v2/init.js
index 726f18141..577406443 100644
--- a/build/npm/v2/init.js
+++ b/build/npm/v2/init.js
@@ -1,10 +1,10 @@
 validateNpmVersion();
 
-const https = require('https');
-const http = require('http');
-const url = require('url');
-const fs = require('fs');
-const packageJson = require('./package.json');
+const {get} = require("https");
+const {request} = require("http");
+const {URL} = require("url");
+const {createWriteStream, chmodSync} = require("fs");
+const packageJson = require("./package.json");
 const fileName = getFileName();
 const filePath = "bin/" + fileName;
 const version = packageJson.version;
@@ -14,52 +14,77 @@ downloadCli();
 
 function validateNpmVersion() {
     if (!isValidNpmVersion()) {
-        throw new Error("JFrog CLI can be installed using npm version 5.0.0 or above.");
+        throw new Error(
+            "JFrog CLI can be installed using npm version 5.0.0 or above."
+        );
     }
 }
 
 function downloadWithProxy(myUrl) {
-    const proxyparts = url.parse(process.env.https_proxy);
-    const myUrlParts = url.parse(myUrl);
+    const proxyparts = new URL(process.env.https_proxy);
+    const myUrlParts = new URL(myUrl);
 
-    http.request({
+    request({
         host: proxyparts.hostname,
         port: proxyparts.port,
-        method: 'CONNECT',
-        path: myUrlParts.hostname + ':443'
-    }).on('connect', function(res, socket, head) {
-        https.get({
-            host: myUrlParts.hostname,
-            socket: socket,
-            path: myUrlParts.path,
-            agent: false
-        }, function(res) {
-            if (res.statusCode === 301 || res.statusCode === 302) {
-                downloadWithProxy(res.headers.location);
-            } else if (res.statusCode === 200) {
-                writeToFile(res);
-            } else {
-                console.log('Unexpected status code ' + res.statusCode + ' during JFrog CLI download');
-            }
-        }).on('error', function (err) {console.error(err);});
-    }).end();
+        method: "CONNECT",
+        path: myUrlParts.hostname + ":443",
+    })
+        .on("connect", function (res, socket, head) {
+            get(
+                {
+                    host: myUrlParts.hostname,
+                    socket: socket,
+                    path: myUrlParts.path,
+                    agent: false,
+                },
+                function (res) {
+                    if (res.statusCode === 301 || res.statusCode === 302) {
+                        downloadWithProxy(res.headers.location);
+                    } else if (res.statusCode === 200) {
+                        writeToFile(res);
+                    } else {
+                        console.log(
+                            "Unexpected status code " +
+                            res.statusCode +
+                            " during JFrog CLI download"
+                        );
+                    }
+                }
+            ).on("error", function (err) {
+                console.error(err);
+            });
+        })
+        .end();
 }
 
 function download(url) {
-    https.get(url, function(res) {
+    get(url, function (res) {
         if (res.statusCode === 301 || res.statusCode === 302) {
             download(res.headers.location);
         } else if (res.statusCode === 200) {
             writeToFile(res);
         } else {
-            console.log('Unexpected status code ' + res.statusCode + ' during JFrog CLI download');
+            console.log(
+                "Unexpected status code " +
+                res.statusCode +
+                " during JFrog CLI download"
+            );
         }
-    }).on('error', function (err) {console.error(err);});
+    }).on("error", function (err) {
+        console.error(err);
+    });
 }
 
 function downloadCli() {
-    console.log("Downloading JFrog CLI " + version );
-    const startUrl = 'https://releases.jfrog.io/artifactory/jfrog-cli/v2/' + version + '/' + pkgName + '/' + fileName;
+    console.log("Downloading JFrog CLI " + version);
+    const startUrl =
+        "https://releases.jfrog.io/artifactory/jfrog-cli/v2/" +
+        version +
+        "/" +
+        pkgName +
+        "/" +
+        fileName;
     // We detect outbound proxy by looking at the environment variable
     if (process.env.https_proxy && process.env.https_proxy.length > 0) {
         downloadWithProxy(startUrl);
@@ -69,7 +94,7 @@ function downloadCli() {
 }
 
 function isValidNpmVersion() {
-    const child_process = require('child_process');
+    const child_process = require("child_process");
     const npmVersionCmdOut = child_process.execSync("npm version -json");
     const npmVersion = JSON.parse(npmVersionCmdOut).npm;
     // Supported since version 5.0.0
@@ -77,45 +102,48 @@ function isValidNpmVersion() {
 }
 
 function writeToFile(response) {
-    const file = fs.createWriteStream(filePath);
-    response.on('data', function (chunk) {
-        file.write(chunk);
-    }).on('end', function () {
-        file.end();
-        if (!process.platform.startsWith("win")) {
-            fs.chmodSync(filePath, 555);
-        }
-    }).on('error', function (err) {
-        console.error(err);
+    const file = createWriteStream(filePath);
+    response
+        .on("data", function (chunk) {
+            file.write(chunk);
+        })
+        .on("end", function () {
+            file.end();
+            if (!process.platform.startsWith("win")) {
+                chmodSync(filePath, 755);
+            }
+        })
+        .on("error", function (err) {
+            console.error(err);
     });
 }
 
 function getArchitecture() {
     const platform = process.platform;
-    if (platform.startsWith('win')) {
+    if (platform.startsWith("win")) {
         // Windows architecture:
-        return 'windows-amd64';
+        return "windows-amd64";
     }
     const arch = process.arch;
-    if (platform.includes('darwin')) {
+    if (platform.includes("darwin")) {
         // macOS architecture:
-        return arch === 'arm64' ? 'mac-arm64' : 'mac-386';
+        return arch === "arm64" ? "mac-arm64" : "mac-386";
     }
 
     // linux architecture:
     switch (arch) {
-        case 'x64':
-            return 'linux-amd64';
-        case 'arm64':
-            return 'linux-arm64';
-        case 'arm':
-            return 'linux-arm';
-        case 's390x':
-            return 'linux-s390x';
-        case 'ppc64':
-            return 'linux-ppc64';
+        case "x64":
+            return "linux-amd64";
+        case "arm64":
+            return "linux-arm64";
+        case "arm":
+            return "linux-arm";
+        case "s390x":
+            return "linux-s390x";
+        case "ppc64":
+            return "linux-ppc64";
         default:
-            return 'linux-386';
+            return "linux-386";
     }
 }