diff --git a/extensions/gitpod/src/extension.ts b/extensions/gitpod/src/extension.ts
index ed33352d91c82..22f0c0d40d900 100644
--- a/extensions/gitpod/src/extension.ts
+++ b/extensions/gitpod/src/extension.ts
@@ -129,17 +129,23 @@ export async function activate(context: vscode.ExtensionContext) {
 
 	function downloadLocalApp(gitpodHost: string): Promise<Response> {
 		let downloadUri = vscode.Uri.parse(gitpodHost);
+		let arch = 'amd64';
+		if (process.arch === 'arm64') {
+			arch = 'arm64';
+		} if (process.arch === 'x32' && process.platform === 'win32') {
+			arch = '386';
+		}
 		if (process.platform === 'win32') {
 			downloadUri = downloadUri.with({
-				path: '/static/bin/gitpod-local-companion-windows.exe'
+				path: `/static/bin/gitpod-local-companion-windows-${arch}.exe`
 			});
 		} else if (process.platform === 'darwin') {
 			downloadUri = downloadUri.with({
-				path: '/static/bin/gitpod-local-companion-darwin'
+				path: `/static/bin/gitpod-local-companion-darwin-${arch}`
 			});
 		} else {
 			downloadUri = downloadUri.with({
-				path: '/static/bin/gitpod-local-companion-linux'
+				path: `/static/bin/gitpod-local-companion-linux-${arch}`
 			});
 		}
 		log(`fetching the local app from ${downloadUri.toString()}`);