diff --git a/Procfile b/Procfile
index 33fb0f4ed9..9719f98045 100644
--- a/Procfile
+++ b/Procfile
@@ -22,8 +22,8 @@
 
 web: gunicorn inspirehep.wsgi -c gunicorn.cfg
 cache: redis-server
-worker: celery worker -E -A inspirehep.celery --loglevel=INFO --workdir="${VIRTUAL_ENV}" --autoreload --pidfile="${VIRTUAL_ENV}/worker.pid" --purge
-workermon: celery flower -A inspirehep.celery
+worker: celery worker -E -A inspirehep.celery --loglevel=INFO --workdir="${VIRTUAL_ENV}" --pidfile="${VIRTUAL_ENV}/worker.pid" --purge
+workermon: flower -A inspirehep.celery
 # beat: celery beat -A inspirehep.celery --loglevel=INFO --workdir="${VIRTUAL_ENV}" --pidfile="${VIRTUAL_ENV}/worker_beat.pid"
 # mathoid: node_modules/mathoid/server.js -c mathoid.config.yaml
 indexer: elasticsearch -Dcluster.name="inspire" -Ddiscovery.zen.ping.multicast.enabled=false -Dpath.data="$VIRTUAL_ENV/var/data/elasticsearch"  -Dpath.logs="$VIRTUAL_ENV/var/log/elasticsearch"
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 725ac267e3..049b0140da 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -30,8 +30,8 @@ services:
       service: base
     environment:
       - APP_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://inspirehep:dbpass123@test-database:5432/inspirehep
-      - APP_BROKER_URL=amqp://guest:guest@test-rabbitmq:5672//
-      - APP_CELERY_RESULT_BACKEND=amqp://guest:guest@test-rabbitmq:5672//
+      - APP_CELERY_BROKER_URL=pyamqp://guest:guest@test-rabbitmq:5672//
+      - APP_CELERY_RESULT_BACKEND=rpc://guest:guest@test-rabbitmq:5672//
       - APP_CACHE_REDIS_URL=redis://test-redis:6379/0
       - APP_ACCOUNTS_SESSION_REDIS_URL=redis://test-redis:6379/2
       - APP_SEARCH_ELASTIC_HOSTS=test-indexer
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f9f404c3b..1f513b8b40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,8 +30,8 @@ services:
       service: base
     environment:
       - APP_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://inspirehep:dbpass123@database:5432/inspirehep
-      - APP_BROKER_URL=amqp://guest:guest@rabbitmq:5672//
-      - APP_CELERY_RESULT_BACKEND=amqp://guest:guest@rabbitmq:5672//
+      - APP_CELERY_BROKER_URL=pyamqp://guest:guest@rabbitmq:5672//
+      - APP_CELERY_RESULT_BACKEND=rpc://guest:guest@rabbitmq:5672//
       - APP_CACHE_REDIS_URL=redis://redis:6379/0
       - APP_ACCOUNTS_SESSION_REDIS_URL=redis://redis:6379/2
       - APP_SEARCH_ELASTIC_HOSTS=indexer
diff --git a/inspirehep/config.py b/inspirehep/config.py
index 475aa3e3ec..c1412d3b09 100644
--- a/inspirehep/config.py
+++ b/inspirehep/config.py
@@ -67,11 +67,11 @@
 
 # Celery
 # ======
-BROKER_URL = "amqp://guest:guest@localhost:5672//"
-CELERY_RESULT_BACKEND = "amqp://guest:guest@localhost:5672//"
+CELERY_BROKER_URL = "pyamqp://guest:guest@localhost:5672//"
+CELERY_RESULT_BACKEND = "rpc://guest:guest@localhost:5672//"
 CELERY_ACCEPT_CONTENT = ['json', 'msgpack', 'yaml']
 CELERY_TIMEZONE = 'Europe/Amsterdam'
-CELERY_DISABLE_RATE_LIMITS = True
+CELERY_WORKER_DISABLE_RATE_LIMITS = True
 CELERYBEAT_SCHEDULE = {
     'journal_kb_builder': {
         'task': 'inspirehep.modules.refextract.tasks.create_journal_kb_file',
diff --git a/setup.py b/setup.py
index 0d198fd778..ce19571cf0 100644
--- a/setup.py
+++ b/setup.py
@@ -49,14 +49,14 @@
     'Flask~=0.0,>=0.12.2',
     'IDUtils~=0.0,>=0.2.4',
     'SQLAlchemy~=1.0,>=1.1.14,<1.2',
-    'amqp~=1.0,>=1.4.9',
     'backoff~=1.0,>=1.4.3',
     'backports.tempfile>=1.0rc1',
     'beard~=0.0,>=0.2.0',
-    'celery~=3.0,>=3.1.25',
+    'celery>=4.0,<5.0',
     'elasticsearch-dsl~=2.0,>=2.2.0',
     'elasticsearch~=2.0,>=2.4.1',
     'flask-shell-ipython~=0.0,>=0.3.0',
+    'flower',
     'inspire-crawler~=0.0,>=0.4.2',
     'inspire-dojson~=53.0,>=53.0.0',
     'inspire-matcher~=0.0,>=0.0.12',
@@ -91,7 +91,6 @@
     'invenio-workflows-ui~=1.0,>=1.1.1',
     'invenio-workflows~=6.0,>=6.1.0',
     'langdetect~=1.0,>=1.0.7',
-    'librabbitmq~=1.0,>=1.6.1',
     'nameparser~=0.0,>=0.5.3',
     'orcid~=0.0,>=0.7.0',
     'plotextractor~=0.0,>=0.1.6',