diff --git a/contrib/builder/deb/ubuntu-debootstrap-precise/Dockerfile b/contrib/builder/deb/ubuntu-precise/Dockerfile
similarity index 94%
rename from contrib/builder/deb/ubuntu-debootstrap-precise/Dockerfile
rename to contrib/builder/deb/ubuntu-precise/Dockerfile
index ae6f464783..50b4a12e16 100644
--- a/contrib/builder/deb/ubuntu-debootstrap-precise/Dockerfile
+++ b/contrib/builder/deb/ubuntu-precise/Dockerfile
@@ -2,7 +2,7 @@
 # THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/generate.sh"!
 #
 
-FROM ubuntu-debootstrap:precise
+FROM ubuntu:precise
 
 RUN apt-get update && apt-get install -y bash-completion  build-essential curl ca-certificates debhelper  git libapparmor-dev  libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/contrib/builder/deb/ubuntu-debootstrap-wily/Dockerfile b/contrib/builder/deb/ubuntu-trusty/Dockerfile
similarity index 94%
rename from contrib/builder/deb/ubuntu-debootstrap-wily/Dockerfile
rename to contrib/builder/deb/ubuntu-trusty/Dockerfile
index a40729e634..aca7eecd8e 100644
--- a/contrib/builder/deb/ubuntu-debootstrap-wily/Dockerfile
+++ b/contrib/builder/deb/ubuntu-trusty/Dockerfile
@@ -2,7 +2,7 @@
 # THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/generate.sh"!
 #
 
-FROM ubuntu-debootstrap:wily
+FROM ubuntu:trusty
 
 RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/contrib/builder/deb/ubuntu-debootstrap-vivid/Dockerfile b/contrib/builder/deb/ubuntu-vivid/Dockerfile
similarity index 94%
rename from contrib/builder/deb/ubuntu-debootstrap-vivid/Dockerfile
rename to contrib/builder/deb/ubuntu-vivid/Dockerfile
index a8e238590a..ee26402743 100644
--- a/contrib/builder/deb/ubuntu-debootstrap-vivid/Dockerfile
+++ b/contrib/builder/deb/ubuntu-vivid/Dockerfile
@@ -2,7 +2,7 @@
 # THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/generate.sh"!
 #
 
-FROM ubuntu-debootstrap:vivid
+FROM ubuntu:vivid
 
 RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/contrib/builder/deb/ubuntu-debootstrap-trusty/Dockerfile b/contrib/builder/deb/ubuntu-wily/Dockerfile
similarity index 94%
rename from contrib/builder/deb/ubuntu-debootstrap-trusty/Dockerfile
rename to contrib/builder/deb/ubuntu-wily/Dockerfile
index 599a74f890..3f79c56e49 100644
--- a/contrib/builder/deb/ubuntu-debootstrap-trusty/Dockerfile
+++ b/contrib/builder/deb/ubuntu-wily/Dockerfile
@@ -2,7 +2,7 @@
 # THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/generate.sh"!
 #
 
-FROM ubuntu-debootstrap:trusty
+FROM ubuntu:wily
 
 RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*