diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index e923869d6d9..11c5e0c0b03 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -40,7 +40,7 @@ function fromLocal(extensionPath) {
             var patchFilesStream = filesStream
                 .pipe(packageJsonFilter)
                 .pipe(buffer())
-                .pipe(json({ main: './dist/main.bundle' })) // hardcoded entry point!
+                .pipe(json({ main: './out/main.bundle' })) // hardcoded entry point!
                 .pipe(packageJsonFilter.restore);
             var webpackConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
             var webpackStream = webpackGulp(webpackConfig, webpack)
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index 500d57517d3..90dd5502981 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -46,7 +46,7 @@ export function fromLocal(extensionPath: string): Stream {
 			const patchFilesStream = filesStream
 				.pipe(packageJsonFilter)
 				.pipe(buffer())
-				.pipe(json({ main: './dist/main.bundle' })) // hardcoded entry point!
+				.pipe(json({ main: './out/main.bundle' })) // hardcoded entry point!
 				.pipe(packageJsonFilter.restore);
 
 			const webpackConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
diff --git a/extensions/git/extension.webpack.config.js b/extensions/git/extension.webpack.config.js
index 3fbe8587fd4..d4f5bf626b4 100644
--- a/extensions/git/extension.webpack.config.js
+++ b/extensions/git/extension.webpack.config.js
@@ -14,11 +14,11 @@ module.exports = {
 	context: __dirname,
 	entry: {
 		main: './out/main.js',
-		askpass: './out/askpass-main.js'
+		['askpass-main']: './out/askpass-main.js'
 	},
 	output: {
 		filename: '[name].bundle.js',
-		path: path.join(__dirname, 'dist'),
+		path: path.join(__dirname, 'out'),
 		libraryTarget: "commonjs"
 	},
 	externals: {