diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..141e31863
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,54 @@
+version: 2
+
+jobs:
+  # Build Website
+  doc:
+    working_directory: ~/fabric8io/dmp-docs
+    docker:
+    - image: circleci/node:8-browsers
+    steps:
+    - checkout
+    - run:
+      - git config --global user.email "circleci@fabric8.io"
+      - git config --global user.name "CircleCI"
+    - run: ./doc/ci-docs.sh
+
+  # Run unit tests
+  build:
+    working_directory: ~/fabric8io/docker-maven-plugin
+    docker:
+    - image: circleci/openjdk:8-node-browsers
+    steps:
+    - checkout
+    - restore_cache:
+        key: dmp-{{ checksum "pom.xml" }}
+    - run: mvn install -Pjacoco
+    - run: bash <(curl -s https://codecov.io/bash)
+    - save_cache:
+        key: dmp-{{ checksum "pom.xml" }}
+        paths:
+        - ~/.m2
+
+  sonar:
+    working_directory: ~/fabric8io/dmp-sonar
+    docker:
+    - image: circleci/openjdk:8-node-browsers
+    steps:
+    - checkout
+    - restore_cache:
+        key: dmp-sonar-{{ checksum "pom.xml" }}
+    - run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${SONAR_TOKEN}
+    - save_cache:
+        key: dmp-sonar-{{ checksum "pom.xml" }}
+        paths:
+        - ~/.m2
+
+workflows:
+  version: 2
+  all:
+    jobs:
+    - doc:
+        filters:
+          branches:
+            only: dmp.fabric8.io
+    - build
diff --git a/.codecov.yml b/.codecov.yml
index 9b0c77373..1ef0eaa68 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -2,11 +2,6 @@ coverage:
   range: "45...90"
   precision: 2
   round: down
-  notify:
-    slack:
-      default:
-        url: "https://hooks.slack.com/services/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"
-        threshold: "2%"
   status:
     project:
       default:
@@ -14,4 +9,4 @@ coverage:
 comment:
   layout: "header, diff, tree, sunburst"
   require_changes: true
-   
+
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 2242c9496..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8
-script:
-  - mvn test -B -Pjacoco
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-after_script:
-  - env
-  - "[[ $TRAVIS_PULL_REQUEST == false ]] && mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${SONAR_TOKEN}"
-  
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index e4f2c11d2..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-machine:
-  node:
-    version: 0.12.0
-
-branches:
-  only:
-    - dmp.fabric8.io
-
-# Dependency resolution happens during `mvn install`. Seem to be broken on some deps
-dependencies:
-  override:
-    - "echo 'No extra dependency resolution'"
-
-general:
-  branches:
-    ignore:
-      - 'gh-pages'
-
-deployment:
-  website:
-    branch: dmp.fabric8.io
-    owner: fabric8io
-    commands:
-      - git config --global user.email "circleci@fabric8.io"
-      - git config --global user.name "CircleCI"
-      - ./doc/ci-docs.sh
-