diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..11070f5219
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,19 @@
+version: 2
+
+jobs:
+  build:
+    working_directory: ~/test
+    machine: true
+    steps:
+      - checkout
+      - run:
+          command: docker pull condaforge/linux-anvil
+      - run:
+          # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
+          command: ./package/conda/run_docker_build.sh
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build
diff --git a/circle.yml b/circle.yml
deleted file mode 100755
index f08dcbb838..0000000000
--- a/circle.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-machine:
-  services:
-    - docker
-
-dependencies:
-  override:
-    - docker pull condaforge/linux-anvil
-
-test:
-  override:
-    - ./package/conda/run_docker_build.sh
diff --git a/package/conda/run_docker_build.sh b/package/conda/run_docker_build.sh
index b6bb8d82f9..bd54e3dc5e 100755
--- a/package/conda/run_docker_build.sh
+++ b/package/conda/run_docker_build.sh
@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 
-# copied from a conda-forge feedstock...
-
 FEEDSTOCK_ROOT=$(cd "$(dirname "$0")"; pwd;)
-RECIPE_ROOT=$FEEDSTOCK_ROOT
-SOURCE_ROOT=$RECIPE_ROOT/../..
+SOURCE_DIR=${FEEDSTOCK_ROOT}/../..
+echo ${SOURCE_DIR}
 
 docker info
 
@@ -15,37 +13,36 @@ channels:
  - conda-forge
  - defaults
 
-conda-build:
- root-dir: /feedstock_root/build_artefacts
-
 show_channel_urls: true
 
 CONDARC
 )
 
+HOST_USER_ID=$(id -u)
+
+
+if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then
+    HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u)
+fi
+
+rm -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done"
+
 cat << EOF | docker run -i \
-                        -v "${SOURCE_ROOT}":/source \
+                        -v "${SOURCE_DIR}":/source \
+                        -e HOST_USER_ID="${HOST_USER_ID}" \
                         -a stdin -a stdout -a stderr \
                         condaforge/linux-anvil \
-                        bash || exit $?
+                        bash || exit 1
 
-export BINSTAR_TOKEN=${BINSTAR_TOKEN}
+set -x
 export PYTHONUNBUFFERED=1
 
 echo "$config" > ~/.condarc
-# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artefacts.
+
 conda clean --lock
 
-conda install --yes --quiet conda-forge-build-setup
-source run_conda_forge_build_setup
+conda install --yes --quiet conda-build
 
-yum install -y libXt-devel libXmu-devel libXi-devel mesa-libGLU-devel rsync
-
-
-# Embarking on 3 case(s).
-
-    set -x
-    export CONDA_PY=36
-    set +x
-    conda build /source/package/conda --quiet || exit 1
-EOF
+/usr/bin/sudo -n yum install -y libXt-devel libXmu-devel libXi-devel mesa-libGLU-devel
+conda build /source/package/conda
+EOF
\ No newline at end of file