diff --git a/debian/control b/debian/control
index 79f149f37..41f1bc431 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.6
 
 Package: passbook
 Architecture: all
-Recommends: mysql-server, redis-server
+Recommends: mysql-server, rabbitmq-server
 Pre-Depends: adduser, libldap2-dev, libsasl2-dev
 Depends: python3 (>= 3.5) | python3.6 | python3.7, python3-pip, dbconfig-pgsql | dbconfig-no-thanks, ${misc:Depends}
 Description: Authentication Provider/Proxy supporting protocols like SAML, OAuth, LDAP and more.
diff --git a/helm/passbook/charts/rabbitmq-4.3.2.tgz b/helm/passbook/charts/rabbitmq-4.3.2.tgz
new file mode 100644
index 000000000..c41057755
Binary files /dev/null and b/helm/passbook/charts/rabbitmq-4.3.2.tgz differ
diff --git a/helm/passbook/requirements.lock b/helm/passbook/requirements.lock
index 8457a7c56..e0d0da107 100644
--- a/helm/passbook/requirements.lock
+++ b/helm/passbook/requirements.lock
@@ -1,9 +1,9 @@
 dependencies:
-- name: redis
+- name: rabbitmq
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 5.1.0
+  version: 4.3.2
 - name: postgresql
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 3.10.1
-digest: sha256:04bd136761f070e94a2ff32ff48ff87f5e07fbd451e5fd7f65551e3bd4680e5e
-generated: 2019-02-08T12:08:49.090666+01:00
+digest: sha256:c36e054785f7d706d7d3f525eb1b167dbc89b42f84da7fc167a18bbb6542c999
+generated: 2019-03-11T20:36:35.125079+01:00
diff --git a/helm/passbook/requirements.yaml b/helm/passbook/requirements.yaml
index 0d5a7feea..9ae71eac5 100644
--- a/helm/passbook/requirements.yaml
+++ b/helm/passbook/requirements.yaml
@@ -1,6 +1,6 @@
 dependencies:
-- name: redis
-  version: 5.1.0
+- name: rabbitmq
+  version: 4.3.2
   repository: https://kubernetes-charts.storage.googleapis.com/
 - name: postgresql
   version: 3.10.1
diff --git a/helm/passbook/templates/passbook-configmap.yaml b/helm/passbook/templates/passbook-configmap.yaml
index f37ddde27..9087373e1 100644
--- a/helm/passbook/templates/passbook-configmap.yaml
+++ b/helm/passbook/templates/passbook-configmap.yaml
@@ -36,7 +36,7 @@ data:
     debug: false
     secure_proxy_header:
       HTTP_X_FORWARDED_PROTO: https
-    redis: ":{{ .Values.redis.password }}@{{ .Release.Name }}-redis-master"
+    rabbitmq: "user:{{ .Values.rabbitmq.rabbitmq.password }}@{{ .Release.Name }}-rabbitmq-master"
     # Error reporting, sends stacktrace to sentry.services.beryju.org
     error_report_enabled: {{ .Values.config.error_reporting }}
 
diff --git a/helm/passbook/values.yaml b/helm/passbook/values.yaml
index 362defea2..ec040c985 100644
--- a/helm/passbook/values.yaml
+++ b/helm/passbook/values.yaml
@@ -18,8 +18,12 @@ config:
     host: localhost
 
 postgresql:
-    postgresqlDatabase: passbook
-    postgresqlPassword: foo
+  postgresqlDatabase: passbook
+  postgresqlPassword: foo
+
+rabbitmq:
+  rabbitmq:
+    password: foo
 
 service:
   type: ClusterIP
@@ -33,7 +37,6 @@ ingress:
   path: /
   hosts:
     - passbook.k8s.local
-    - kubernetes-healthcheck-host
   defaultHost: passbook.k8s.local
   tls: []
   #  - secretName: chart-example-tls
diff --git a/passbook/core/requirements.txt b/passbook/core/requirements.txt
index 388f39bfe..dea78258c 100644
--- a/passbook/core/requirements.txt
+++ b/passbook/core/requirements.txt
@@ -7,7 +7,6 @@ raven
 markdown
 colorlog
 celery
-redis
 psycopg2
 idna<2.8,>=2.5
 cherrypy
diff --git a/passbook/core/settings.py b/passbook/core/settings.py
index e05247a3b..0b0585761 100644
--- a/passbook/core/settings.py
+++ b/passbook/core/settings.py
@@ -184,8 +184,9 @@ CELERY_TIMEZONE = TIME_ZONE
 CELERY_BEAT_SCHEDULE = {}
 CELERY_CREATE_MISSING_QUEUES = True
 CELERY_TASK_DEFAULT_QUEUE = 'passbook'
-CELERY_BROKER_URL = 'redis://%s' % CONFIG.get('redis')
-CELERY_RESULT_BACKEND = 'redis://%s' % CONFIG.get('redis')
+CELERY_BROKER_URL = 'amqp://%s' % CONFIG.get('rabbitmq')
+CELERY_RESULT_BACKEND = 'rpc://'
+CELERY_ACKS_LATE = True
 
 # Raven settings
 RAVEN_CONFIG = {
diff --git a/passbook/lib/default.yml b/passbook/lib/default.yml
index ce1a05797..564609625 100644
--- a/passbook/lib/default.yml
+++ b/passbook/lib/default.yml
@@ -29,7 +29,7 @@ web:
 debug: false
 secure_proxy_header:
   HTTP_X_FORWARDED_PROTO: https
-redis: localhost
+rabbitmq: guest:guest@localhost/passbook
 # Error reporting, sends stacktrace to sentry.services.beryju.org
 error_report_enabled: true
 secret_key: 9$@r!d^1^jrn#fk#1#@ks#9&i$^s#1)_13%$rwjrhd=e8jfi_s