diff --git a/docker/bin/docker-entrypoint.sh b/docker/bin/docker-entrypoint.sh
index 64d728b..85e2a63 100755
--- a/docker/bin/docker-entrypoint.sh
+++ b/docker/bin/docker-entrypoint.sh
@@ -30,16 +30,16 @@ case "$1" in
       ;;
     worker)
       set -- tini -- "$@"
-      set -- gosu user:app celery -A hope_payment_gateway.config.celery worker -E --loglevel=ERROR --concurrency=4
+      set -- gosu hope:unicef celery -A hope_payment_gateway.config.celery worker -E --loglevel=ERROR --concurrency=4
       ;;
     beat)
       set -- tini -- "$@"
-      set -- gosu user:app celery -A hope_payment_gateway.config.celery beat --loglevel=ERROR --scheduler django_celery_beat.schedulers:DatabaseScheduler
+      set -- gosu hope:unicef celery -A hope_payment_gateway.config.celery beat --loglevel=ERROR --scheduler django_celery_beat.schedulers:DatabaseScheduler
       ;;
     flower)
       export DATABASE_URL="sqlite://:memory:"
       set -- tini -- "$@"
-      set -- gosu user:app celery -A hope_payment_gateway.config.celery flower
+      set -- gosu hope:unicef celery -A hope_payment_gateway.config.celery flower
       ;;
 esac
 
diff --git a/src/hope_payment_gateway/apps/fsp/moneygram/tasks.py b/src/hope_payment_gateway/apps/fsp/moneygram/tasks.py
index 49b89fe..3be2032 100644
--- a/src/hope_payment_gateway/apps/fsp/moneygram/tasks.py
+++ b/src/hope_payment_gateway/apps/fsp/moneygram/tasks.py
@@ -10,7 +10,7 @@
     PaymentRecord,
     PaymentRecordState,
 )
-from hope_payment_gateway.celery import app
+from hope_payment_gateway.config.celery import app
 
 
 @app.task()  # queue="executors"
diff --git a/src/hope_payment_gateway/apps/fsp/western_union/tasks.py b/src/hope_payment_gateway/apps/fsp/western_union/tasks.py
index c457ec7..c579147 100644
--- a/src/hope_payment_gateway/apps/fsp/western_union/tasks.py
+++ b/src/hope_payment_gateway/apps/fsp/western_union/tasks.py
@@ -12,7 +12,7 @@
     PaymentRecord,
     PaymentRecordState,
 )
-from hope_payment_gateway.celery import app
+from hope_payment_gateway.config.celery import app
 
 
 @app.task()  # queue="executors"
diff --git a/src/hope_payment_gateway/celery.py b/src/hope_payment_gateway/config/celery.py
similarity index 100%
rename from src/hope_payment_gateway/celery.py
rename to src/hope_payment_gateway/config/celery.py