diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..d186f79
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,40 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: springcloud/pipeline-base
+        user: appuser
+    environment:
+      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+      TERM: dumb
+    branches:
+      ignore:
+        - gh-pages # list of branches to ignore
+    resource_class: large
+    steps:
+      - checkout
+      - restore_cache:
+          key: sc-cloudfoundry-{{ .Branch }}
+      - run:
+          name: "Download dependencies"
+          command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+      - save_cache:
+          key: sc-cloudfoundry-{{ .Branch }}
+          paths:
+            - ~/.m2
+      - run:
+          name: "Running build"
+          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - run:
+          name: "Aggregate test results"
+          when: always
+          command: |
+            mkdir -p ~/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
+            bash <(curl -s https://codecov.io/bash)
+      - store_artifacts:
+          path: ~/junit/
+          destination: artifacts
+      - store_test_results:
+          path: ~/junit/
+          destination: testartifacts
\ No newline at end of file
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 3e841d9..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-general:
-  branches:
-    ignore:
-      - gh-pages # list of branches to ignore
-machine:
-  java:
-    version: oraclejdk8
-  environment:
-    _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
-dependencies:
-  override:
-    - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
-test:
-  override:
-    - ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-  post:
-    - find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS
-    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
-    - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
-    - bash <(curl -s https://codecov.io/bash)
diff --git a/docs/pom.xml b/docs/pom.xml
index 1eae597..99d11f3 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -15,7 +15,7 @@
 	<properties>
 		<docs.main>spring-cloud-cloudfoundry</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>1.0.x,1.1.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>1.0.x,1.1.x,2.1.x</docs.whitelisted.branches>
 	</properties>
 	<build>
 		<plugins>