diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/Dockerfile
new file mode 100644
index 000000000..72252db89
--- /dev/null
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/Dockerfile
@@ -0,0 +1,15 @@
+FROM hawkbit/hawkbit-update-server:0.2.0M4
+
+MAINTAINER Kai Zimmermann <kai.zimmermann@bosch-si.com>
+
+ENV MARIADB_DRIVER_VERSION=2.1.2
+    
+# Install mariadb driver
+RUN set -x \
+    && gpg --keyserver pgp.mit.edu --recv-keys CE1A3DD5E3C94F49 f8957c3395910043 \
+    && gpg --trusted-key CE1A3DD5E3C94F49 --list-keys f8957c3395910043 \
+    && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \
+    && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \
+    && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar
+
+ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=amqp,mysql","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/docker-compose.yml b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/docker-compose.yml
new file mode 100644
index 000000000..57a2965e2
--- /dev/null
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/docker-compose.yml
@@ -0,0 +1,72 @@
+version: '2'
+
+services:
+
+  # ---------------------
+  # The rabbitMQ service
+  # ---------------------
+  rabbitmq:
+    image: "rabbitmq:3-management"
+    hostname: "rabbitmq"
+    environment:
+      RABBITMQ_DEFAULT_VHOST: "/"
+    restart: always
+    ports:
+      - "15672:15672"
+      - "5672:5672"
+    labels:
+      NAME: "rabbitmq"
+      
+  # ---------------------
+  # The mysql service    
+  # ---------------------
+  mysql:
+    image: "mysql:5.7"
+    hostname: "mysql"
+    environment:
+      MYSQL_DATABASE: "hawkbit"
+      MYSQL_USER: "root"
+      MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+    restart: always
+    ports:
+      - "3306:3306"
+    labels:
+      NAME: "mysql"
+  
+  # ---------------------
+  # The hawkbit service
+  # ---------------------
+  hawkbit:
+    image: "hawkbit/hawkbit-update-server:0.2.0M4-mysql"
+    hostname: "hawkbit"
+    links:
+        - mysql
+        - rabbitmq
+    environment:
+      - 'SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/hawkbit'
+      - 'SPRING_RABBITMQ_HOST=rabbitmq'
+      - 'SPRING_RABBITMQ_USERNAME=guest'
+      - 'SPRING_RABBITMQ_PASSWORD=guest'
+      - 'SPRING_DATASOURCE_USERNAME=root'
+    restart: always
+    ports:
+      - "8080:8080"
+    labels:
+      NAME: "hawkbit"
+
+  # ---------------------
+  # The hawkbit-simulator service
+  # ---------------------
+  hawkbit-simulator:
+    image: "hawkbit/hawkbit-device-simulator:latest"
+    hostname: "hawkbit-device-simulator"
+    links:
+        - hawkbit
+        - rabbitmq    
+    environment:
+      - 'SPRING_RABBITMQ_HOST=rabbitmq'
+    restart: always
+    ports:
+      - "8083:8083"
+    labels:
+      NAME: "hawkbit-device-simulator"
\ No newline at end of file