diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
index 8b4385ac..d8c94a3e 100644
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@@ -138,4 +138,3 @@ system:
     osx: '/Users/build-user'
     win: '/c/builds/tc-workdir'
   sox_win: '/usr/bin/wget.exe https://sourceforge.net/projects/sox/files/sox/14.4.2/sox-14.4.2-win32.zip/download -O sox-14.4.2-win32.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa sox-14.4.2-win32.zip && rm sox-*zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/sox-14.4.2/:$PATH'
-aptEc2Mirrors: 'echo "deb http://archive.ubuntu.com/ubuntu/ trusty-updates main" > /etc/apt/sources.list.d/trusty-updates.list && apt-get -qq update && apt-get -qq -y upgrade'
diff --git a/taskcluster/docker-build-base.tyml b/taskcluster/docker-build-base.tyml
index 6e4d2471..6d46a4bd 100644
--- a/taskcluster/docker-build-base.tyml
+++ b/taskcluster/docker-build-base.tyml
@@ -30,7 +30,6 @@ then:
           dockerfile: { $eval: strip(str(build.dockerfile)) }
         in: >
           apt-get -qq -y remove --purge ubuntu-advantage-tools &&
-          ${aptEc2Mirrors} &&
           apt-get -qq update && apt-get -qq -y install git wget pkg-config apt-transport-https ca-certificates curl software-properties-common make &&
           curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - &&
           add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" &&
diff --git a/taskcluster/node-package-opt-base.tyml b/taskcluster/node-package-opt-base.tyml
index b17daaac..b14cdd4c 100644
--- a/taskcluster/node-package-opt-base.tyml
+++ b/taskcluster/node-package-opt-base.tyml
@@ -30,7 +30,7 @@ then:
 
   payload:
     maxRunTime: { $eval: to_int(build.maxRunTime) }
-    image: "ubuntu:14.04"
+    image: "ubuntu:16.04"
 
     command:
       - "/bin/bash"
@@ -40,10 +40,8 @@ then:
           extraSystemSetup: { $eval: strip(str(build.system_setup)) }
           extraSystemConfig: { $eval: strip(str(build.system_config)) }
         in: >
-          apt-get -qq -y remove --purge ubuntu-advantage-tools &&
-          ${aptEc2Mirrors} &&
           adduser --system --home ${system.homedir.linux} ${system.username} &&
-          apt-get -qq update && apt-get -qq -y install realpath git wget curl make && ${extraSystemSetup} &&
+          apt-get -qq update && apt-get -qq -y install realpath git wget curl make sudo && ${extraSystemSetup} &&
           cd ${system.homedir.linux}/ &&
           echo -e "#!/bin/bash\nset -xe\n env && id && git clone --quiet ${event.head.repo.url} ~/DeepSpeech/ds/ && cd ~/DeepSpeech/ds && git checkout --quiet ${event.head.sha} && mkdir -p ~/DeepSpeech/tf/ && touch ~/DeepSpeech/tf/tc-vars.sh && chmod +x ~/DeepSpeech/tf/tc-vars.sh && mkdir -p ${system.homedir.linux}/.cache/node-gyp/ && wget -O - ${system.node_gyp_cache.url} | tar -C ${system.homedir.linux}/.cache/node-gyp/ -xzf -" > /tmp/clone.sh && chmod +x /tmp/clone.sh &&
           sudo -H -u ${system.username} /bin/bash /tmp/clone.sh && ${extraSystemConfig} &&
diff --git a/taskcluster/test-linux-opt-base.tyml b/taskcluster/test-linux-opt-base.tyml
index fcb8b466..67f8220b 100644
--- a/taskcluster/test-linux-opt-base.tyml
+++ b/taskcluster/test-linux-opt-base.tyml
@@ -44,7 +44,6 @@ then:
       - $let:
           extraSystemSetup: { $eval: strip(str(build.system_setup)) }
         in: >
-          ${aptEc2Mirrors} &&
           apt-get -qq update && apt-get -qq -y install curl python-simplejson git pixz sox sudo wget && ${extraSystemSetup} &&
           adduser --system --home ${system.homedir.linux} ${system.username} &&
           cd ${system.homedir.linux} &&