diff --git a/circle.yml b/circle.yml
index 354feb5d..17690eb9 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,34 +1,20 @@
 version: 2
 jobs:
-   test:
+   build:
      docker:
        - image: circleci/openjdk:8u141
      steps:
-            - checkout
-            - run: ./mvnw -Pdistribute,snapshot,docs clean test
-   test_next:
-     docker:
-       - image: circleci/openjdk:8u141
-     steps:
-            - checkout
-            - run: ./mvnw -Pspringnext clean test
-   deploy:
-     docker:
-       - image: circleci/openjdk:8u141
-     steps:
-            - checkout
-            - run: ./deploy.bash
-
-workflows:
-  version: 2
-  test_and_deploy:
-    - test
-    - test_next
-    - deploy:
-      requires:
-        - test
-        - test_next
-
+        - checkout
+        - run:
+            name: Test current version
+            command: ./mvnw -Pdistribute,snapshot,docs clean test
+        - run:
+            name: Test Spring.NEXT
+            command: ./mvnw -Pspringnext clean test
+        - run:
+            name: Deploy to Artifactory
+            command: ./deploy.bash
+                
 general:
   branches:
     ignore:
diff --git a/deploy.bash b/deploy.bash
index 8150707d..a1dfeb7d 100755
--- a/deploy.bash
+++ b/deploy.bash
@@ -2,4 +2,6 @@
 
 if [ "${CIRCLE_BRANCH}" == "master" ] || [ "${CIRCLE_BRANCH}" == "2.x" ]; then
 	./mvnw -Pdistribute,snapshot,docs clean deploy
+else
+	echo "We only deploy 'master' and '2.x' branches"
 fi
\ No newline at end of file