diff --git a/celery/celery_docker/Dockerfile b/celery/celery_docker/Dockerfile
deleted file mode 100644
index 8ad561536..000000000
--- a/celery/celery_docker/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM alpine:3.8
-
-ENV BUILD_PACKAGES postgresql-dev graphviz-dev graphviz build-base git pkgconfig \
-                   python3-dev libxml2-dev jpeg-dev libressl-dev libffi-dev libxslt-dev \
-                   nodejs py3-lxml py3-magic postgresql-client poppler-utils antiword \
-                   curl jq openssh-client vim openssh-client bash
-
-RUN apk update --update-cache && apk upgrade
-
-RUN apk --update add fontconfig ttf-dejavu && fc-cache -fv
-
-RUN apk add --no-cache python3 nginx tzdata && \
-    python3 -m ensurepip && \
-    rm -r /usr/lib/python*/ensurepip && \
-    pip3 install --upgrade pip setuptools && \
-    rm -r /root/.cache && \
-    rm -f /etc/nginx/conf.d/*
-
-RUN mkdir -p /var/interlegis/sapl && \
-    apk add --update --no-cache $BUILD_PACKAGES
-
-WORKDIR /var/interlegis/sapl/
-
-ADD . /var/interlegis/sapl/
-
-RUN pip install -r /var/interlegis/sapl/requirements/dev-requirements.txt --upgrade setuptools && \
-    rm -r /root/.cache
-
-RUN rm -rf /var/interlegis/sapl/celery/celery_log/*
-
-RUN chmod +x /var/interlegis/sapl/celery/celery_start/start.sh
-
-CMD ["/var/interlegis/sapl/celery/celery_start/start.sh"]
diff --git a/celery/celery_start/start.sh b/celery/celery_start/start.sh
deleted file mode 100644
index d57274551..000000000
--- a/celery/celery_start/start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-celery multi start 2 -A sapl -l info -Q:1 email_queue -c:1 1 -Q:2 celery -c:2 1 --pidfile=./celery/celery_log/%n.pid --logfile=./celery/celery_log/%n%I.log
-
-echo "Celery started"
-
-while true; do sleep 2; done
-
-echo "Celery finished"
diff --git a/docker-compose.yml b/docker-compose.yml
index ca223aed4..ecbbcad76 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,20 +9,32 @@ sapldb:
   volumes:
     - sapldb_data:/var/lib/postgresql/data/
   ports:
-    - "5433:5432"
+    - "5432:5432"
+
 saplredis:
   image: redis:5.0.3-stretch
   restart: always
   ports: 
     - "6379:6379"
+
+#saplsolr:
+#  image: solr:7.4-alpine
+#  restart: always
+#  command: bin/solr start -c -f
+#  volumes:
+#    - solr_data:/opt/solr/server/solr
+#    - solr_configsets:/opt/solr/server/solr/configsets
+#  ports:
+#    - "8983:8983"
+
 sapl:
-  #image: interlegis/sapl:master
-  build: .
+  image: interlegis/sapl:master
+  #build: .
   restart: always
   environment:
     ADMIN_PASSWORD: interlegis
     ADMIN_EMAIL: email@dominio.net
-    DEBUG: 'True'
+    DEBUG: 'False'
     EMAIL_PORT: 587
     EMAIL_USE_TLS: 'False'
     EMAIL_HOST: smtp.dominio.net
@@ -32,19 +44,17 @@ sapl:
     USE_CHANNEL_LAYERS: 'True'
     PORT_CHANNEL_LAYERS: 6379
     HOST_CHANNEL_LAYERS: saplredis
+#    USE_SOLR: 'True'
+#    SOLR_COLLECTION: sapl
+#    SOLR_URL: http://saplsolr:8983
     TZ: America/Sao_Paulo
+    CELERY_BROKER_URL: redis://saplredis:6379
   volumes:
     - sapl_data:/var/interlegis/sapl/data
     - sapl_media:/var/interlegis/sapl/media
   links:
     - sapldb
     - saplredis
+    #- saplsolr
   ports:
     - "80:80"
-saplcelery:
-  build: .
-  dockerfile: ./celery/celery_docker/Dockerfile
-  environment:
-    CELERY_BROKER_URL: redis://saplredis:6379
-  links:
-    - saplredis
diff --git a/start.sh b/start.sh
index 2dd159890..3afa0176c 100755
--- a/start.sh
+++ b/start.sh
@@ -101,6 +101,9 @@ if [ $lack_pwd -eq 0 ]; then
    # return -1
 fi
 
+rm -rf /var/interlegis/sapl/celery_log/*
+celery multi start 2 -A sapl -l info -Q:1 email_queue -c:1 1 -Q:2 celery -c:2 1 --pidfile=./celery_log/%n.pid --logfile=./celery_log/%n%I.log
+
 echo "-------------------------------------"
 echo "| ███████╗ █████╗ ██████╗ ██╗       |"
 echo "| ██╔════╝██╔══██╗██╔══██╗██║       |"