diff --git a/src/util/codeUtil.ts b/src/util/codeUtil.ts
index 273ddbb82..be8d0f818 100644
--- a/src/util/codeUtil.ts
+++ b/src/util/codeUtil.ts
@@ -361,7 +361,7 @@ export class CodeUtil {
         this.cliEnv = 'ELECTRON_RUN_AS_NODE=1';
 
         if (platform === 'linux') {
-            platform += arch === 'x64' ? `-${arch}` : `-ia32`;
+            platform += arch === 'x64' || arch === 'arm64' ? `-${arch}` : `-ia32`;
         } else if (platform === 'win32') {
             platform += arch === 'x64' ? `-${arch}` : '';
             platform += '-archive';
diff --git a/src/util/driverUtil.ts b/src/util/driverUtil.ts
index 67873a15b..d3c514eca 100644
--- a/src/util/driverUtil.ts
+++ b/src/util/driverUtil.ts
@@ -50,7 +50,11 @@ export class DriverUtil {
         }
         fs.mkdirpSync(this.downloadFolder);
         const driverPlatform = (process.platform === 'darwin') ? 'mac64' : process.platform === 'win32' ? 'win32' : 'linux64';
-        const url = `https://chromedriver.storage.googleapis.com/${version}/chromedriver_${driverPlatform}.zip`;
+        let url = `https://chromedriver.storage.googleapis.com/${version}/chromedriver_${driverPlatform}.zip`;
+        if (process.platform === 'linux' && process.arch === 'arm64') {
+            //TODO: Would need to set the version dynamic with regard version of vscode
+            url = "https://github.com/electron/electron/releases/download/v25.3.1/chromedriver-v25.3.1-linux-arm64.zip"
+        }
         const fileName = path.join(this.downloadFolder, path.basename(url));
         console.log(`Downloading ChromeDriver ${version} from: ${url}`);
         await Download.getFile(url, fileName, true);
@@ -126,4 +130,4 @@ export class DriverUtil {
 
 interface VersionMap {
     [key:number]: string
-}
\ No newline at end of file
+}