diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1269488
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+data
diff --git a/docker-compose.yml b/docker-compose.yml
index 0df39be..9d070fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,17 +2,32 @@
 
 services:
     jenkins-slave1:
-      #image: jenkinsci/ssh-slave
       image: pgollor/jenkins-slave
       mem_limit: 4g
       restart: always
       environment:
         - JENKINS_SLAVE_SSH_PUBKEY=${JENKINS_SLAVE_SSH_PUBKEY}
       volumes:
-        - ./data/:/home/jenkins/
+        - ./data/slave1:/home/jenkins/
       tmpfs:
         - /tmp:rw
         - /run:rw,size=64m
         - /vat/run:rw,size=64m
       ports:
-        - "${JENKINS_SLAVE_SSH_BIND}:${JENKINS_SLAVE_SSH_PORT}:22"
+        - "${JENKINS_SLAVE_SSH_BIND}:${JENKINS_SLAVE1_SSH_PORT}:22"
+
+services:
+    jenkins-slave2:
+      image: pgollor/jenkins-slave-arduino
+      mem_limit: 4g
+      restart: always
+      environment:
+        - JENKINS_SLAVE_SSH_PUBKEY=${JENKINS_SLAVE_SSH_PUBKEY}
+      volumes:
+        - ./data/slave2:/home/jenkins/
+      tmpfs:
+        - /tmp:rw
+        - /run:rw,size=64m
+        - /vat/run:rw,size=64m
+      ports:
+        - "${JENKINS_SLAVE_SSH_BIND}:${JENKINS_SLAVE2_SSH_PORT}:22"
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 0c8fb5b..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM jenkinsci/ssh-slave
-LABEL MAINTAINER="Pascal Gollor <kalle@pgollor.de>"
-
-## install dependencies
-RUN apt -y update && apt -y upgrade
diff --git a/docker/arduino/Dockerfile b/docker/arduino/Dockerfile
new file mode 100644
index 0000000..2fb66df
--- /dev/null
+++ b/docker/arduino/Dockerfile
@@ -0,0 +1,10 @@
+FROM pgollor/jenkins-slave
+LABEL MAINTAINER="Pascal Gollor <kalle@pgollor.de>"
+
+# install arduino
+RUN ( \
+	wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz \
+	&& tar xf arduino.tar.xz \
+	&& mv arduino-nightly arduino \
+	&& export PATH="$PWD/arduino:$PATH" \
+	)
diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index 695997a..5bbd2cf 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -2,4 +2,6 @@
 LABEL MAINTAINER="Pascal Gollor <kalle@pgollor.de>"
 
 ## install dependencies
-RUN apt-get -y update && apt-get -y upgrade
+RUN apt-get -y update \
+	&& apt-get -y upgrade \
+	&& rm -rf /var/lib/apt/lists/*