diff --git a/Dockerfile b/Dockerfile
index d2b7972e..e2139cbe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,5 +28,6 @@ RUN apt-get install -y locales && \
 # We unfortunately cannot use update-locale because docker will not use the env variables
 # configured in /etc/default/locale so we need to set it manually.
 ENV LANG=en_US.UTF-8
-# Unfortunately `.` does not work with code-server.
+ENTRYPOINT code-server
+# Unfortunately `.` does not work with code-server so we use shell form.
 CMD code-server $PWD
diff --git a/README.md b/README.md
index 53e91bbd..42189d1f 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 Try it out:
 ```bash
-docker run -p 127.0.0.1:8443:8443 -v "${PWD}:/root/project" codercom/code-server code-server --allow-http --no-auth
+docker run -p 127.0.0.1:8443:8443 -v "${PWD}:/root/project" -v ~/.code-server:/root/.code-server codercom/code-server --allow-http --no-auth
 ```
 
 - Code on your Chromebook, tablet, and laptop with a consistent dev environment.
diff --git a/scripts/install-packages.ts b/scripts/install-packages.ts
index ae4808cc..9517c9c1 100644
--- a/scripts/install-packages.ts
+++ b/scripts/install-packages.ts
@@ -41,10 +41,7 @@ const handlePackages = async (dir: string): Promise<void> => {
 		const pkgDir = join(dir, pkg);
 		const pkgJsonPath = join(pkgDir, "package.json");
 		if (existsSync(pkgJsonPath)) {
-			const ip = doInstall(pkg, pkgDir);
-			if (os.platform() === "win32") {
-				await ip;
-			}
+			const ip = await doInstall(pkg, pkgDir);
 		}
 	}
 };