diff --git a/gvafile/fileservertasks/celery.py b/gvafile/fileservertasks/celery.py
index 79b0051..f7f38ac 100644
--- a/gvafile/fileservertasks/celery.py
+++ b/gvafile/fileservertasks/celery.py
@@ -11,5 +11,5 @@ from celery import Celery
 #: The Celery application
 app = Celery('fileservertasks')
 
-app.config_from_object('fileservertasks.settings')
+app.config_from_object('fileservertasks.settings', namespace="CELERY")
 app.autodiscover_tasks(['fileservertasks.tasks'], force=True)
diff --git a/gvafile/fileservertasks/settings.py b/gvafile/fileservertasks/settings.py
index b1816e0..f83da5b 100644
--- a/gvafile/fileservertasks/settings.py
+++ b/gvafile/fileservertasks/settings.py
@@ -25,16 +25,16 @@ def get_env_variable(setting):
 
 
 ########## CELERY CONFIGURATION
-CELERY_TIMEZONE = "Europe/Berlin"
-CELERY_ENABLE_UTC = True
+CELERY_BROKER_URL = get_env_variable("GVAFILE_BROKER_URL")
 CELERY_RESULT_BACKEND = get_env_variable("GVAFILE_RESULTS_REDIS_URL")
 CELERY_RESULT_PERSISTENT = True
 CELERY_TASK_RESULT_EXPIRES = None
 CELERY_ROUTES = ("gvacommon.celeryrouters.GvaRouter",)
+CELERY_TIMEZONE = "Europe/Berlin"
+CELERY_ENABLE_UTC = True
 CELERY_ACCEPT_CONTENT = ["json"]
 CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
-BROKER_URL = get_env_variable("GVAFILE_BROKER_URL")
 ########## END CELERY CONFIGURATION
 
 ########## GVAFILE CONFIGURATION