diff --git a/Makefile b/Makefile
index bc51f4a..b1a65b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
 kontor_api := kontor-api
 kontor_spring := kontor-spring
+kontor_servicemix := kontor-servicemix
 
 .PHONY: all $(kontor_spring) $(kontor_api)
-all: $(kontor_spring) $(kontor_api)
+all: $(kontor_spring) $(kontor_api) $(kontor_servicemix)
 
-$(kontor_spring) $(kontor_api):
+$(kontor_spring) $(kontor_api) $(kontor_servicemix):
 	$(MAKE) --directory=$@ $(TARGET)
 
diff --git a/docker-compose.yml b/docker-compose.yml
index cfac911..aa8f218 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,13 +54,28 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-
+  kontor-servicemix:
+    image: kontor-servicemix:0.2.0-SNAPSHOT
+    restart: unless-stopped
+    networks:
+      - frontend
+    ports:
+      - 1099:1099
+      - 8101:8101
+      - 8181:8181
+      - 61616:61616
+      - 44444:44444
+    volumes:
+      - servicemix-install:/opt/servicemix
+      - kontor-deploy:/deploy
 networks:
   database:
   frontend:
 volumes:
   postgres-data:
   images-data:
+  servicemix-install:
+  kontor-deploy:
 secrets:
   db-password:
     file: db-password.txt
diff --git a/kontor-servicemix/Dockerfile b/kontor-servicemix/Dockerfile
new file mode 100644
index 0000000..1703c53
--- /dev/null
+++ b/kontor-servicemix/Dockerfile
@@ -0,0 +1,20 @@
+FROM openjdk:8-jdk-alpine
+#ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+
+ENV SERVICEMIX_VERSION_MAJOR=7
+ENV SERVICEMIX_VERSION_MINOR=0
+ENV SERVICEMIX_VERSION_PATCH=1
+ENV SERVICEMIX_VERSION=${SERVICEMIX_VERSION_MAJOR}.${SERVICEMIX_VERSION_MINOR}.${SERVICEMIX_VERSION_PATCH}
+
+RUN wget http://dlcdn.apache.org/servicemix/servicemix-${SERVICEMIX_VERSION_MAJOR}/${SERVICEMIX_VERSION}/apache-servicemix-${SERVICEMIX_VERSION}.zip; \
+    unzip -d /opt apache-servicemix-${SERVICEMIX_VERSION}.zip; \
+    rm -f apache-servicemix-${SERVICEMIX_VERSION}.zip; \
+    ln -s /opt/apache-servicemix-${SERVICEMIX_VERSION} /opt/servicemix; \
+    mkdir /deploy; \
+    sed -i 's/^\(felix\.fileinstall\.dir\s*=\s*\).*$/\1\/deploy/' /opt/servicemix/etc/org.apache.felix.fileinstall-deploy.cfg; \
+    sed -i 's/http:\/\//https:\/\//' /opt/servicemix/etc/org.ops4j.pax.url.mvn.cfg
+
+VOLUME ["/deploy"]
+EXPOSE 1099 8101 8181 61616 44444
+ENTRYPOINT ["/opt/servicemix/bin/servicemix"]
+
diff --git a/kontor-servicemix/Makefile b/kontor-servicemix/Makefile
new file mode 100644
index 0000000..38f66c3
--- /dev/null
+++ b/kontor-servicemix/Makefile
@@ -0,0 +1,5 @@
+.PHONY: clean docker
+
+docker: 
+	docker build -t kontor-servicemix:0.2.0-SNAPSHOT .
+