--- a/taskcluster/docker/beet-mover/Dockerfile
+++ b/taskcluster/docker/beet-mover/Dockerfile
@@ -1,12 +1,10 @@
-FROM ubuntu:vivid
+FROM ubuntu:xenial
 
-# Ubuntu Vivid has been moved to the old-releases repo
-RUN sed -i -e 's/archive.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
 RUN apt-get -q update \
     && apt-get install --yes -q \
     mercurial \
     python-dev \
     python-pip \
     python-virtualenv \
     libffi-dev \
     liblzma-dev \

--- a/taskcluster/docker/funsize-balrog-submitter/Dockerfile
+++ b/taskcluster/docker/funsize-balrog-submitter/Dockerfile
@@ -1,15 +1,13 @@
-FROM ubuntu:vivid
+FROM ubuntu:xenial
 MAINTAINER Rail Aliiev <rail@mozilla.com>
 
 # Required software
 ENV DEBIAN_FRONTEND noninteractive
-# Ubuntu Vivid has been moved to the old-releases repo
-RUN sed -i -e 's/archive.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
 # Chain apt-get commands with apt-get clean in a single docker RUN
 # to make sure that files are removed within a single docker layer
 RUN apt-get update -q && \
     apt-get install -yyq --no-install-recommends \
     python mercurial curl python-boto python-setuptools python-cryptography \
     python-dev gcc liblzma-dev && \
     apt-get clean