diff --git a/Dockerfile b/Dockerfile
index e2139cbe..dbe56137 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,5 +29,4 @@ RUN apt-get install -y locales && \
 # configured in /etc/default/locale so we need to set it manually.
 ENV LANG=en_US.UTF-8
 ENTRYPOINT code-server
-# Unfortunately `.` does not work with code-server so we use shell form.
-CMD code-server $PWD
+CMD ["."]
diff --git a/README.md b/README.md
index 6a4ac351..86847be7 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 Try it out:
 ```bash
-docker run -t -p 127.0.0.1:8443:8443 -v "${PWD}:/root/project" codercom/code-server code-server --allow-http --no-auth
+docker run -t -p 127.0.0.1:8443:8443 -v "${PWD}:/root/project" codercom/code-server --allow-http --no-auth
 ```
 
 - Code on your Chromebook, tablet, and laptop with a consistent dev environment.
diff --git a/build/tasks.ts b/build/tasks.ts
index db0353f2..d7cc6283 100644
--- a/build/tasks.ts
+++ b/build/tasks.ts
@@ -241,6 +241,10 @@ const ensureClean = register("vscode:clean", async (runner) => {
 			throw new Error(`Failed to remove unstaged files: ${removeUnstaged.stderr}`);
 		}
 	}
+	const fetch = await runner.execute("git", ["fetch", "--prune"]);
+	if (fetch.exitCode !== 0) {
+		throw new Error(`Failed to fetch latest changes: ${fetch.stderr}`);
+	}
 });
 
 const ensurePatched = register("vscode:patch", async (runner) => {