diff --git a/docker-compose.yml b/docker-compose.yml
index 6e9dd002a52bff8ba706fe34f75e9788aefc16a4..a4d845d064c64139f6d1f3ee58d03e03a33a411f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -280,5 +280,40 @@ services:
     image: redis:alpine
     ports: ["6380:6379"]
 
+  rabbitmq:
+    image: rabbitmq:3-management
+    hostname: my-rabbit
+    environment:
+      RABBITMQ_DEFAULT_USER: "rabbitmq"
+      RABBITMQ_DEFAULT_PASS: "rabbitmq"
+      RABBITMQ_DEFAULT_VHOST: "/"
+    ports:
+      - "15672:15672"
+      - "5672:5672"
+
+  worker:
+    build:
+      context: .
+      dockerfile: ./development/dockerfiles/bloclink/worker.Dockerfile
+    command: celery -A bloclink worker -l info --logfile /var/log/simulation.log
+    depends_on:
+      - rabbitmq
+    volumes:
+      - .:/code
+      - eplus:/eplus_data
+
+  pentaho:
+    build:
+      context: .
+      dockerfile: ./development/dockerfiles/bloclink/pentaho.Dockerfile
+    command: carte.sh /pentaho-di/carte_config.xml
+    ports:
+      - "9081:9081"
+    volumes:
+      - pentaho_di:/jobs
+      - eplus:/eplus_data
+
 volumes:
   pgdata:
+  eplus:
+  pentaho_di:
diff --git a/dockerfiles/blocnote.dockerfile b/dockerfiles/blocnote.dockerfile
index 3f08742a2840dfb85f9cb4dd73f781ca6d0d30ef..8130a705f0402d18cec4141ebd5ddc2be31ff112 100644
--- a/dockerfiles/blocnote.dockerfile
+++ b/dockerfiles/blocnote.dockerfile
@@ -8,7 +8,6 @@ ENV PYTHONUNBUFFERED 1
 WORKDIR /app
 
 ARG service_path
-
 COPY $service_path/requirements* /app/
 
 RUN pip install numpy==1.12.0
diff --git a/entrypoints/bloclink-entry.sh b/entrypoints/bloclink-entry.sh
index 8700887546225db69032fadedd752770988c267b..5b74a0231996f81a17f002de47d0020190699726 100644
--- a/entrypoints/bloclink-entry.sh
+++ b/entrypoints/bloclink-entry.sh
@@ -1,5 +1,4 @@
 #! /bin/bash
-
 # Collect static files
 RUN python manage.py collectstatic --noinput
 
diff --git a/nginx/conf.d/services.conf b/nginx/conf.d/services.conf
index 69cd0e455aa28324abc0126033ac67f50620ce63..bc2f61aafa788b9b105398653071c1780b2c778b 100644
--- a/nginx/conf.d/services.conf
+++ b/nginx/conf.d/services.conf
@@ -159,3 +159,18 @@ server { # Bloclink.
         proxy_pass http://bloclink:5310;
     }
 }
+server { # Bloclink.
+    large_client_header_buffers 16 32k;
+    listen      5410;
+    server_name 0.0.0.0;
+
+    include ./conf.d/error-location.inc;
+
+    location / {
+        add_header 'Access-Control-Allow-Origin' '*' always;
+        add_header 'Access-Control-Allow-Methods' 'HEAD, GET, POST, PUT, DELETE, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'x-blocpower-app-key,x-blocpower-app-secret,x-blocpower-app-token,x-blocpower-auth-key,x-blocpower-auth-token,x-blocpower-google-token,x-blocpower-auth0-token' always;
+        add_header 'Access-Control-Expose-Headers' 'x-blocpower-app-key,x-blocpower-app-secret,x-blocpower-app-token,x-blocpower-auth-key,x-blocpower-auth-token,x-blocpower-google-token,x-blocpower-auth0-token' always;
+        proxy_pass http://bloclink:5310;
+    }
+}