diff --git a/docker/dep/Dockerfile b/docker/dep/Dockerfile
index 5fd1675f7f..c94a4a2182 100644
--- a/docker/dep/Dockerfile
+++ b/docker/dep/Dockerfile
@@ -4,12 +4,17 @@
 # docker export pprz-dep | gzip -c > pprz-dep.tgz
 # docker import pprz-dep < pprz-dep.tgz
 
-# Use phusion/baseimage as base image.
-FROM phusion/baseimage:0.9.16
+FROM ubuntu:14.04
 MAINTAINER Felix Ruess <felix.ruess@gmail.com>
 
-# Use baseimage-docker's init system.
-CMD ["/sbin/my_init"]
+# Add Tini
+ENV TINI_VERSION v0.8.4
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
+# setup environment
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
 
 # Set the env variable DEBIAN_FRONTEND to noninteractive
 ENV DEBIAN_FRONTEND noninteractive
@@ -17,6 +22,7 @@ ENV DEBIAN_FRONTEND noninteractive
 # add Paparazzi PPA
 RUN apt-get update && apt-get install -y software-properties-common
 RUN add-apt-repository ppa:paparazzi-uav/ppa
+RUN add-apt-repository ppa:terry.guo/gcc-arm-embedded
 
 # install paparazzi-dev which pull in the dependencies
 # also install cross compiler and some stuff for X
@@ -30,3 +36,6 @@ RUN apt-get update && apt-get install -y \
 
 # Clean up APT when done.
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+ENTRYPOINT ["/tini", "--"]
+CMD ["bash"]
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index 18b4aaee43..ee9c8a7af9 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -40,3 +40,5 @@ WORKDIR $HOME
 
 # set gtk theme
 RUN echo include \"/usr/share/themes/Ambiance/gtk-2.0/gtkrc\" > $HOME/.gtkrc-2.0
+
+CMD ["bash"]
diff --git a/docker/run.sh b/docker/run.sh
index dce5c676d8..007394d280 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 #set -x
 
 # if no arguments given, start with interactive terminal
 if test $# -lt 1; then
-    args="-t -i flixr/pprz-dev /sbin/my_init -- bash"
+    args="-t -i flixr/pprz-dev"
 else
     # Use this script with derived images, and pass your 'docker run' args
     args="$@"