diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06e452b..1dc8e4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- 2018-09-30 [Bugfix] Fix CMS celery worker, including export tasks
 - 2018-09-30 [Improvement] Simplify boolean feature flags definition
 - 2018-09-29 [Improvement] Add logging commands
 - 2018-09-29 [Improvement] Add self-documented help with "make help"
diff --git a/docker-compose.yml b/docker-compose.yml
index 71480b0..fd56912 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -121,10 +121,9 @@ services:
       context: ./openedx
     environment:
       SERVICE_VARIANT: lms
+      C_FORCE_ROOT: "1" # run celery tasks as root #nofear
     command: ./manage.py lms celery worker --loglevel=info --hostname=edx.lms.core.default.%%h --maxtasksperchild 100
     restart: unless-stopped
-    environment:
-      C_FORCE_ROOT: "1" # run celery tasks as root #nofear
     volumes:
       - ./config/openedx:/openedx/config
       - ./data/lms_worker:/openedx/data
@@ -137,10 +136,9 @@ services:
       context: ./openedx
     environment:
       SERVICE_VARIANT: cms
+      C_FORCE_ROOT: "1" # run celery tasks as root #nofear
     command: ./manage.py cms celery worker --loglevel=info --hostname=edx.cms.core.default.%%h --maxtasksperchild 100
     restart: unless-stopped
-    environment:
-      C_FORCE_ROOT: "1" # run celery tasks as root #nofear
     volumes:
       - ./config/openedx:/openedx/config
       - ./data/cms_worker:/openedx/data