diff --git a/.circleci/config.yml b/.circleci/config.yml
index c03c6b990..d7803aa9e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/repo
   docker:
-    - image: rthz/pyodide-env:0.3.0
+    - image: iodide/pyodide-env:0.3.0
 
 jobs:
   build:
diff --git a/Dockerfile b/Dockerfile
index 2961c4c1b..782668fe5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,8 @@ FROM circleci/python:3.7.0-stretch
 # Set up the Debian testing repo, and then install g++ from there...
 RUN sudo bash -c "echo \"deb http://ftp.us.debian.org/debian testing main contrib non-free\" >> /etc/apt/sources.list" \
   && sudo apt-get update \
-  && sudo apt-get install node-less cmake build-essential clang-format-6.0 uglifyjs chromium ccache libncurses6 \
-  # for extracting firefox and running chrome, respectively
-  && sudo apt-get install -y bzip2 libgconf-2-4 \
+  # bzip2 and libgconf-2-4 are necessary for extracting firefox and running chrome, respectively
+  && sudo apt-get install bzip2 libgconf-2-4 node-less cmake build-essential clang-format-6.0 uglifyjs chromium ccache libncurses6 \
   && sudo apt-get install -t testing g++-8 \
   && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6 \
   && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 80 --slave /usr/bin/g++ g++ /usr/bin/g++-8 \