diff --git a/gvaldap/gvaldap/settings/base.py b/gvaldap/gvaldap/settings/base.py
index 525fd78..70de0e7 100644
--- a/gvaldap/gvaldap/settings/base.py
+++ b/gvaldap/gvaldap/settings/base.py
@@ -286,5 +286,6 @@ BROKER_URL = get_env_setting('GVALDAP_BROKER_URL')
 CELERY_RESULT_BACKEND = 'amqp'
 CELERY_RESULT_PERSISTENT = True
 CELERY_TASK_RESULT_EXPIRES = None
-CELERY_ACCEPT_CONTENT = ['pickle']
+CELERY_ACCEPT_CONTENT = ['yaml']
+CELERY_RESULT_SERIALIZER = 'yaml'
 ########## END CELERY CONFIGURATION
diff --git a/requirements/base.txt b/requirements/base.txt
index 3f694fb..a2c45e6 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -10,3 +10,4 @@ passlib==1.6.2
 billiard==3.3.0.17
 kombu==3.0.16
 pytz==2014.3
+pyaml==14.05.7