diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6ed6460..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-language: java
-
-# Get latest install-jdk.sh script
-before_install:
-  - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
-
-matrix:
-  include:
-    - env: PROFILE=non-existent DEPLOY=true
-      jdk: oraclejdk8
-    - env: PROFILE=spring5-next
-      jdk: oraclejdk8
-    - env: PROFILE=springdata-next
-      jdk: oraclejdk8
-    - env: JDK='Open JDK 10' PROFILE=non-existent
-      install: . ./install-jdk.sh -F 10 -L GPL
-    - env: JDK='Open JDK 10' PROFILE=spring5-next
-      install: . ./install-jdk.sh -F 10 -L GPL
-    - env: JDK='Open JDK 10' PROFILE=springdata-next
-      install: . ./install-jdk.sh -F 10 -L GPL
-    - env: JDK='Oracle JDK 10' PROFILE=non-existent
-      install: . ./install-jdk.sh -F 10 -L BCL
-    - env: JDK='Oracle JDK 10' PROFILE=spring5-next
-      install: . ./install-jdk.sh -F 10 -L BCL
-    - env: JDK='Oracle JDK 10' PROFILE=springdata-next
-      install: . ./install-jdk.sh -F 10 -L BCL
-
-cache:
-  directories:
-  - $HOME/.m2
-
-os:
-- linux
-
-branches:
-  except:
-  - gh-pages
-
-sudo: false
-script: ./build.bash
-
-notifications:
-  slack:
-    secure: fKLKkvaIVRK4l0f+PjFIZTwnVmgmFilKv1uS2XFFhFWPjAzSF0Qi0H2ZKt3cYRTbhNkUGksRbTivbvi9/p69lIpLn0HbM9p6theS7EdgP6O4VkDk9ubMysO9JZRp/5APJN3JJqHCC9gKCabyFwtsixKfzKhPtxNwhNiOAP7a/izuIdCq9Cl+lOskdFp3nAY3U8+Jk0zsE26TdRQ/7uOTDlWl4RU5h0UEr+AGxns+Du/K2efxpWrmOEjiIVQMSFGXJ3FBonX1XZcLu8RweLSARVcjPzZyOZgNWoziRvG9rprDRM6pZGEuSTDW/OIi3EcUezEXLkx5VxpaxS7ELNSBiQxsSpyWSIbTeUdA63n2VCSs5yfGJzuRG2zci0tSObEQtYNaSWoGFTW4EAliS4HmibN697vjoLO+s6mqc37YLkRa+aZctDHVKByDIgniOjz27/t1ZVgqVwOABfAjXxJyLLNrOkWoWAhwKWji+xvIIq+OK6TysWKs8ivTgJwMfeQ0yEEmo0/BaOONNvwUGgWX5/0xq4UvBJxIZzNbL6HUPBBUMCAJf+2t9S3zoBy2ML54ardhfk28jVOiH0lOLC/rQfQzCjM9FxQ4eBSy6TIdEJkCitfRrIVkDH23YmCuQl9nVrjwX+Jak6VRGvjYYs41N8dRxrN4cK6433LV9qyOvAA=
diff --git a/README.adoc b/README.adoc
index 8f110d3..91d6076 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,6 @@
 image:https://badges.gitter.im/spring-projects/spring-session.svg[link="https://gitter.im/spring-projects/spring-session?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 
-image:https://travis-ci.org/spring-projects/spring-session-data-mongodb.svg?branch=master["Build Status", link="https://travis-ci.org/spring-projects/spring-session-data-mongodb"]
+image:https://circleci.com/gh/spring-projects/spring-session-data-mongodb.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-projects/spring-session-data-mongodb"]
 
 = Spring Session MongoDB
 Greg Turnquist
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..d2d9a88
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,104 @@
+version: 2
+jobs:
+   j8_current:
+     docker:
+       - image: circleci/openjdk:8u141
+     steps:
+        - checkout
+        - run:
+            name: Java 8 - Test current version
+            command: mvn clean dependency:list test -P${PROFILE} -Dsort
+            environment:
+              PROFILE: non-existent
+
+   j8_spring_next:
+     docker:
+       - image: circleci/openjdk:8u141
+     steps:
+        - checkout
+        - run:
+            name: Java 8 - Test Spring.NEXT
+            command: mvn clean dependency:list test -P${PROFILE} -Dsort
+            environment:
+              PROFILE: spring5-next
+
+   j8_springdata_next:
+     docker:
+       - image: circleci/openjdk:8u141
+     steps:
+        - checkout
+        - run:
+            name: Java 8 - Test Spring Data.NEXT
+            command: mvn clean dependency:list test -P${PROFILE} -Dsort
+            environment:
+              PROFILE: springdata-next
+
+   j10_current:
+     docker:
+       - image: circleci/openjdk:10.0.1-jdk-node-browsers
+     steps:
+        - checkout
+        - run:
+            name: Java 10 - Test current version
+            command: mvn clean dependency:list test -P${PROFILE} -Dsort
+            environment:
+              PROFILE: non-existent
+
+   j10_spring_next:
+     docker:
+       - image: circleci/openjdk:10.0.1-jdk-node-browsers
+     steps:
+        - checkout
+        - run:
+            name: Java 10 - Test Spring.NEXT
+            command: mvn clean dependency:list test -P${PROFILE} -Dsort
+            environment:
+              PROFILE: spring5-next
+
+   j10_springdata_next:
+     docker:
+       - image: circleci/openjdk:10.0.1-jdk-node-browsers
+     steps:
+        - checkout
+        - run:
+            name: Java 10 - Test Spring Data.NEXT
+            command: mvn clean dependency:list test -P${PROFILE} -Dsort
+            environment:
+              PROFILE: springdata-next
+
+   deploy:
+     docker:
+       - image: circleci/openjdk:8u141
+     steps:
+        - checkout
+        - run:
+            name: Deploy to Artifactory
+            command: ./deploy.bash
+
+workflows:
+  version: 2
+  build-and-deploy:
+    jobs:
+      - j8_current
+      - j8_spring_next
+      - j8_springdata_next
+      - j10_current
+      - j10_spring_next
+      - j10_springdata_next
+      - deploy:
+          requires:
+            - j8_current
+            - j8_spring_next
+            - j8_springdata_next
+            - j10_current
+            - j10_spring_next
+            - j10_springdata_next
+
+general:
+  branches:
+    ignore:
+      - gh-pages # list of branches to ignore
+
+dependencies:
+  cache_directories:
+    - "~/.m2"
diff --git a/deploy.bash b/deploy.bash
new file mode 100755
index 0000000..4ff2678
--- /dev/null
+++ b/deploy.bash
@@ -0,0 +1,7 @@
+#!/bin/bash -x
+
+if [ "${CIRCLE_BRANCH}" == "master" ]; then
+	mvn -Pdistribute,snapshot,docs clean deploy
+else
+	echo "We only deploy 'master' branch"
+fi
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3769ad8..d588114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,8 +107,8 @@
 			<id>springdata-next</id>
 			<properties>
 				<reactor.version>Bismuth-BUILD-SNAPSHOT</reactor.version>
-				<mongo.version>3.8.0-beta1</mongo.version>
-				<mongo-reactivestreams.version>1.8.0</mongo-reactivestreams.version>
+				<mongo.version>3.8.0-beta2</mongo.version>
+				<mongo-reactivestreams.version>1.9.0-beta1</mongo-reactivestreams.version>
 				<spring.version>5.0.7.BUILD-SNAPSHOT</spring.version>
 				<spring-data.version>Lovelace-BUILD-SNAPSHOT</spring-data.version>
 				<spring-security.version>5.0.5.RELEASE</spring-security.version>