diff --git a/.appveyor.yml b/.appveyor.yml
index 839ae1a1ff..6f87c22b13 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -19,8 +19,11 @@ environment:
 
   matrix:
     - CONDA_LOC: "C:\\Miniconda-x64"
+      PATCH_VS2008: "1"
     - CONDA_LOC: "C:\\Miniconda35-x64"
+      PATCH_VS2008: "0"
     - CONDA_LOC: "C:\\Miniconda36-x64"
+      PATCH_VS2008: "0"
 
 install:
   # This breaks conda-build because of git
@@ -29,9 +32,12 @@ install:
   - cmd: set PYTHONUNBUFFERED=1
   - cmd: conda install -n root --yes conda conda-env conda-build anaconda-client
   # We borrow a trick from conda-forge to fix the VS2008 compiler
-  - cmd: conda config --append channels conda-forge
-  - cmd: conda install --yes vs2008_express_vc_python_patch
-  - cmd: call setup_x64
+  - ps: |
+      if($env:PATCH_VS2008 -eq '1') {
+        cmd /c "conda config --append channels conda-forge 2>&1"
+        cmd /c "conda install --yes vs2008_express_vc_python_patch 2>&1"
+        cmd /c "call setup_x64 2>&1"
+      }
 
 build: off
 
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 46fd53b800..09f05ff1ca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   build_pkgs:
     docker:
-      - image: milaudem/libgpuarray:0
+      - image: joaander/conda-build:20170905
 
     steps:
       - checkout
@@ -27,11 +27,11 @@ jobs:
           command: |
             if [[ -n "${CIRCLE_TAG}" ]]
             then
-                anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/linux-64/libgpuarray*
-                anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/linux-64/pygpu*
+                anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /opt/conda/conda-bld/linux-64/libgpuarray*
+                anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /opt/conda/conda-bld/linux-64/pygpu*
             fi
       - store_artifacts:
-          path: /miniconda/conda-bld/linux-64
+          path: /opt/conda/conda-bld/linux-64
 
 workflows:
   version: 2