diff --git a/common b/common
index 52dfe7ab1db..d8aa79b2b56 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 52dfe7ab1dbda9d2a05f2d63bedac63e30a4e5ad
+Subproject commit d8aa79b2b560b8f8d691298fec1912c6c679c8c1
diff --git a/readthedocs/doc_builder/environments.py b/readthedocs/doc_builder/environments.py
index 038aeb0d834..25443f05322 100644
--- a/readthedocs/doc_builder/environments.py
+++ b/readthedocs/doc_builder/environments.py
@@ -148,7 +148,9 @@ def run(self):
             proc = subprocess.Popen(
                 self.command,
                 shell=self.shell,
-                cwd=self.cwd,
+                # This is done here for local builds, but not for docker,
+                # as we want docker to expand inside the container
+                cwd=os.path.expandvars(self.cwd),
                 stdin=stdin,
                 stdout=stdout,
                 stderr=stderr,