diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc4de12..0c953d8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,9 +1,13 @@
-version: 2
-jobs:
-  build:
+version: 2.1
+
+executors:
+  python-executor:
     working_directory: ~/phovea
     docker:
       - image: circleci/python:3.7-buster-node-browsers # for node version see Dockerfile on https://hub.docker.com/r/circleci/python
+jobs:
+  build:
+    executor: python-executor
     steps:
       - checkout
       - run:
@@ -50,7 +54,7 @@ jobs:
           path: dist
           destination: dist
 workflows:
-  version: 2
+  version: 2.1
 #  build-nightly:
 #    triggers:
 #      - schedule:
@@ -61,17 +65,9 @@ workflows:
 #                - develop
 #    jobs:
 #      - build
-  build-branch:
-    jobs:
-      - build:
-          filters:
-            tags:
-              ignore: /^v.*/
-  build-tag:
+  build-branches-and-tags:
     jobs:
       - build:
           filters:
-            branches:
-              ignore: /.*/
             tags:
-              only: /^v.*/
+              only: /.*/
diff --git a/package.json b/package.json
index a661a10..fa9143d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taco_server",
   "description": "The server part for comparing large tabular data using Phovea",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "contact@caleydo.org",
diff --git a/requirements.txt b/requirements.txt
index a10b915..84c79de 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 sklearn==0.0
-phovea_server>=6.0.0,<7.0.0
\ No newline at end of file
+phovea_server>=7.0.0,<8.0.0
\ No newline at end of file
diff --git a/requirements_dev.txt b/requirements_dev.txt
index f34272b..10476e2 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -1,6 +1,6 @@
-flake8==3.7.9
-pep8-naming==0.9.1
-pytest==5.3.5
+flake8==3.8.4
+pep8-naming==0.11.1
+pytest==6.1.2
 pytest-runner==5.2
-Sphinx==2.4.2
+Sphinx==3.3.1
 recommonmark==0.6.0