--- a/testing/docker/desktop-test/Dockerfile
+++ b/testing/docker/desktop-test/Dockerfile
@@ -1,16 +1,42 @@
-FROM          taskcluster/ubuntu1204-test-upd:0.1.11.20160628204600
+FROM          ubuntu:12.04
 MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>
 
+RUN useradd -d /home/worker -s /bin/bash -m worker
+WORKDIR /home/worker
+
+# %include testing/docker/recipes/tooltool.py
+ADD topsrcdir/testing/docker/recipes/tooltool.py /setup/tooltool.py
+
+# %include testing/docker/recipes/install-mercurial.sh
+ADD topsrcdir/testing/docker/recipes/install-mercurial.sh /tmp/install-mercurial.sh
+
+# %include testing/docker/recipes/ubuntu1204-test-system-setup.sh
+ADD topsrcdir/testing/docker/recipes/ubuntu1204-test-system-setup.sh /setup/system-setup.sh
+RUN bash /setup/system-setup.sh
+
+# %include testing/docker/recipes/run-task
+ADD topsrcdir/testing/docker/recipes/run-task /home/worker/bin/run-task
+
 # This will create a host mounted filesystem when the cache is stripped
 # on Try. This cancels out some of the performance losses of aufs. See
 # bug 1291940.
 VOLUME /home/worker/workspace
 
+# Set variable normally configured at login, by the shells parent process, these
+# are taken from GNU su manual
+ENV           HOME          /home/worker
+ENV           SHELL         /bin/bash
+ENV           USER          worker
+ENV           LOGNAME       worker
+ENV           HOSTNAME      taskcluster-worker
+ENV           LANG          en_US.UTF-8
+ENV           LC_ALL        en_US.UTF-8
+
 # Add utilities and configuration
 COPY           dot-files/config              /home/worker/.config
 COPY           dot-files/pulse               /home/worker/.pulse
 COPY           dot-files/hgrc                /home/worker/.hgrc
 COPY           bin                           /home/worker/bin
 RUN            chmod +x bin/*
 # TODO: remove this when buildbot is gone
 COPY           buildprops.json               /home/worker/buildprops.json

deleted file mode 100644
--- a/testing/docker/ubuntu1204-test-upd/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM          taskcluster/ubuntu1204-test:0.1.11
-MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
-
-### update to latest from upstream repositories
-# if this becomes a long list of packages, consider bumping the
-# ubunt1204-test version
-RUN apt-get update && apt-get upgrade -y --force-yes
-
-# Set a default command useful for debugging
-CMD ["/bin/bash", "--login"]

deleted file mode 100644
--- a/testing/docker/ubuntu1204-test-upd/REGISTRY
+++ /dev/null
@@ -1,1 +0,0 @@
-taskcluster

deleted file mode 100644
--- a/testing/docker/ubuntu1204-test-upd/VERSION
+++ /dev/null
@@ -1,1 +0,0 @@
-0.1.11.20160628204600

deleted file mode 100644
--- a/testing/docker/ubuntu1204-test/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM          ubuntu:12.04
-MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>
-
-RUN useradd -d /home/worker -s /bin/bash -m worker
-WORKDIR /home/worker
-
-# %include testing/docker/recipes/tooltool.py
-ADD topsrcdir/testing/docker/recipes/tooltool.py /setup/tooltool.py
-
-# %include testing/docker/recipes/install-mercurial.sh
-ADD topsrcdir/testing/docker/recipes/install-mercurial.sh /tmp/install-mercurial.sh
-
-# install non-build specific dependencies in a single layer
-# %include testing/docker/recipes/ubuntu1204-test-system-setup.sh
-ADD topsrcdir/testing/docker/recipes/ubuntu1204-test-system-setup.sh /setup/system-setup.sh
-RUN           bash /setup/system-setup.sh
-
-# %include testing/docker/recipes/run-task
-ADD topsrcdir/testing/docker/recipes/run-task /home/worker/bin/run-task
-
-# Set variable normally configured at login, by the shells parent process, these
-# are taken from GNU su manual
-ENV           HOME          /home/worker
-ENV           SHELL         /bin/bash
-ENV           USER          worker
-ENV           LOGNAME       worker
-ENV           HOSTNAME      taskcluster-worker
-ENV           LANG          en_US.UTF-8
-ENV           LC_ALL        en_US.UTF-8
-
-# Set a default command useful for debugging
-CMD ["/bin/bash", "--login"]

deleted file mode 100644
--- a/testing/docker/ubuntu1204-test/REGISTRY
+++ /dev/null
@@ -1,1 +0,0 @@
-taskcluster

deleted file mode 100644
--- a/testing/docker/ubuntu1204-test/VERSION
+++ /dev/null
@@ -1,1 +0,0 @@
-0.1.11