diff --git a/Dockerfile b/Dockerfile
index e303bef..33c36ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,7 @@
 FROM base/archlinux 
-#FROM arch-python
 
 WORKDIR /app
 
-ADD . /app
-
 # Update
 RUN pacman -Syu --noconfirm
 
@@ -26,7 +23,7 @@ RUN pacman -S --noconfirm python-matplotlib
 ## Triskele
 RUN git clone https://git.normalized.xyz/Florent/Triskele.git \
     && cd Triskele \
-    && make -f MakefileNoOTB apGenerator \
+    && make -f MakefileNoOTB apGenerator -j 8\
     && cd python \
     && pip install -e .
 
@@ -37,4 +34,7 @@ RUN git clone https://git.normalized.xyz/Florent/LD2DAPs.git \
 
 RUN mkdir Enrichment Data
 
+## Minigrida scripts
+ADD . /app
+
 CMD ["python", "supervisor.py"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 75b5c7e..f45778d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,8 @@ services:
   minigrida:
     build: .
     image: metropolis:5000/minigrida
+    environment:
+      - HOST
     volumes:
       - enrichment:/app/Enrichment
       - data:/app/Data
diff --git a/supervisor.py b/supervisor.py
index bada05e..48d4089 100644
--- a/supervisor.py
+++ b/supervisor.py
@@ -122,7 +122,7 @@ def run(expe_file):
 
 def create_report(experience, stime=None, etime=None):
     expe_report = OrderedDict()
-    expe_report['supervisor'] = os.uname()[1]
+    expe_report['supervisor'] = os.environ["HOST"]
 
     # Dates
     for datek, timev in zip(('start_date', 'end_date'), (stime, etime)):