diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml
index 90b1e59..0c267cc 100644
--- a/.github/workflows/insider-linux.yml
+++ b/.github/workflows/insider-linux.yml
@@ -114,16 +114,16 @@ jobs:
         include:
         - vscode_arch: x64
           npm_arch: x64
-          image: vscodium/vscodium-linux-build-agent:bionic-x64
+          image: vscodium/vscodium-linux-build-agent:focal-x64
         - vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:bionic-arm64
+          image: vscodium/vscodium-linux-build-agent:focal-arm64
         - vscode_arch: armhf
           npm_arch: arm
-          image: vscodium/vscodium-linux-build-agent:bionic-armhf
+          image: vscodium/vscodium-linux-build-agent:focal-armhf
         - vscode_arch: ppc64le
           npm_arch: ppc64
-          image: vscodium/vscodium-linux-build-agent:bionic-ppc64le
+          image: vscodium/vscodium-linux-build-agent:focal-ppc64le
     container:
       image: ${{ matrix.image }}
       env:
diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml
index 5ca216e..affc45e 100644
--- a/.github/workflows/stable-linux.yml
+++ b/.github/workflows/stable-linux.yml
@@ -111,16 +111,16 @@ jobs:
         include:
         - vscode_arch: x64
           npm_arch: x64
-          image: vscodium/vscodium-linux-build-agent:bionic-x64
+          image: vscodium/vscodium-linux-build-agent:focal-x64
         - vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:bionic-arm64
+          image: vscodium/vscodium-linux-build-agent:focal-arm64
         - vscode_arch: armhf
           npm_arch: arm
-          image: vscodium/vscodium-linux-build-agent:bionic-armhf
+          image: vscodium/vscodium-linux-build-agent:focal-armhf
         - vscode_arch: ppc64le
           npm_arch: ppc64
-          image: vscodium/vscodium-linux-build-agent:bionic-ppc64le
+          image: vscodium/vscodium-linux-build-agent:focal-ppc64le
     container:
       image: ${{ matrix.image }}
       env:
diff --git a/patches/ext-from-gh.patch b/patches/ext-from-gh.patch
new file mode 100644
index 0000000..b7bc98f
--- /dev/null
+++ b/patches/ext-from-gh.patch
@@ -0,0 +1,22 @@
+diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
+index 1b0adc4..b595123 100644
+--- a/build/lib/builtInExtensions.js
++++ b/build/lib/builtInExtensions.js
+@@ -47,5 +47,3 @@ function isUpToDate(extension) {
+ function getExtensionDownloadStream(extension) {
+-    const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl;
+-    return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension))
+-        .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
++    return ext.fromGithub(extension).pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
+ }
+diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
+index fefed43..4ae553e 100644
+--- a/build/lib/builtInExtensions.ts
++++ b/build/lib/builtInExtensions.ts
+@@ -72,5 +72,3 @@ function isUpToDate(extension: IExtensionDefinition): boolean {
+ function getExtensionDownloadStream(extension: IExtensionDefinition) {
+-	const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl;
+-	return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension))
+-		.pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
++	return ext.fromGithub(extension).pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
+ }