diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index 59501c10b4..b490cc3ca4 100644
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -13,7 +13,7 @@ version: "2.1"
 services:
 
   progs:
-    image: eu.gcr.io/openedx-231314/edraak/progs
+    image: eu.gcr.io/openedx-231314/edraak/progs:latest
     environment:
       PROGS_CFG: /app/docker.json
       NODE_ENV: development
@@ -31,6 +31,29 @@ services:
       - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
       - ~/.ssh/:/root/.ssh
 
+  celery:
+    image: eu.gcr.io/openedx-231314/edraak/progs:latest
+    environment:
+      PROGS_CFG: /app/docker.json
+    container_name: edraak.devstack.programs.celery
+    command: bash -c 'while true; do celery -A edraakprograms worker -l INFO; sleep 2; done'
+    restart: always
+    working_dir: /app
+    depends_on:
+      - redis
+    volumes:
+      - progs_media:/edx/var/progs/media
+      - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
+      - ~/.ssh/:/root/.ssh
+
+  flower:
+    image: mher/flower:0.9.7
+    command: [ 'flower', '--broker=redis://redis:6379', '--port=5555' ]
+    ports:
+      - 5557:5555
+    depends_on:
+      - redis
+
   router:
     depends_on:
       - progs
diff --git a/docker-compose.yml b/docker-compose.yml
index a0807c2803..276435499d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -89,6 +89,11 @@ services:
           - analytics.edraak.dev
           - auth.edraak.dev
 
+  redis:
+    image: "redis:alpine"
+    expose:
+      - 6379
+
 volumes:
   elasticsearch_data:
   mongo_data:
diff --git a/progs.mk b/progs.mk
index 0eabe7b2ea..95d6ab1043 100644
--- a/progs.mk
+++ b/progs.mk
@@ -31,6 +31,9 @@ progs.build:
 progs.pushimage:
 	docker push eu.gcr.io/openedx-231314/edraak/progs
 
+progs.makemigrations:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py makemigrations --settings=edraakprograms.dev
+
 progs.migrate:
 	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev