diff --git a/common b/common
index a71355f0f30..543a7d7473d 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a71355f0f307718d863985c6cfbf5e1a8a4cd609
+Subproject commit 543a7d7473d2d329700ee549950708ad4589de99
diff --git a/dockerfiles/nginx/proxito.conf.template b/dockerfiles/nginx/proxito.conf.template
index 24d80e9a947..d252bc9d583 100644
--- a/dockerfiles/nginx/proxito.conf.template
+++ b/dockerfiles/nginx/proxito.conf.template
@@ -22,17 +22,11 @@ server {
 
     # Proxy the "readthedocs-addons.js" to be downloaded from GitHub
     location /_/static/javascript/readthedocs-addons.js {
-        proxy_pass https://raw.githubusercontent.com/readthedocs/addons/$NGINX_ADDONS_GITHUB_TAG/dist/readthedocs-addons.js;
-        proxy_cache_valid 24h;
-        proxy_hide_header Content-Type;
-        add_header Content-Type	"text/javascript; charset=utf-8" always;
+        proxy_pass http://addons:8000/readthedocs-addons.js;
     }
 
     location /_/static/javascript/readthedocs-addons.js.map {
-        proxy_pass https://raw.githubusercontent.com/readthedocs/addons/$NGINX_ADDONS_GITHUB_TAG/dist/readthedocs-addons.js.map;
-        proxy_cache_valid 24h;
-        proxy_hide_header Content-Type;
-        add_header Content-Type	"text/javascript; charset=utf-8" always;
+        proxy_pass http://addons:8000/readthedocs-addons.js.map;
     }
 
     # Proxito doc serving
diff --git a/docs/dev/install.rst b/docs/dev/install.rst
index af24236cbdb..a595986a687 100644
--- a/docs/dev/install.rst
+++ b/docs/dev/install.rst
@@ -34,11 +34,13 @@ Install external dependencies (Docker, Docker Compose, gVisor)
 Set up your environment
 -----------------------
 
-#. Clone the ``readthedocs.org`` repository:
+#. Clone all the required repositories:
 
    .. prompt:: bash
 
       git clone --recurse-submodules https://github.com/readthedocs/readthedocs.org/
+      git clone --recurse-submodules https://github.com/readthedocs/ext-theme/
+      git clone --recurse-submodules https://github.com/readthedocs/addons/
 
 #. Install or clone additional repositories:
 
@@ -55,7 +57,7 @@ Set up your environment
       export GITHUB_USER="..."
 
    In order to make development changes on any of our private repositories,
-   such as ``readthedocs-ext`` or ``ext-theme``, you will also need to check these repositories out:
+   such as ``readthedocs-ext``, you will also need to check these repositories out:
 
    .. prompt:: bash
 
@@ -89,7 +91,12 @@ Set up your environment
 
    .. prompt:: bash
 
-      inv docker.up  --init  # --init is only needed the first time
+      inv docker.up  --ext-theme --webpack --init
+
+   .. warning::
+
+      ``--init`` is only needed the first time.
+
 
 #. Go to http://devthedocs.org to access your local instance of Read the Docs.