diff --git a/diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash b/diskimage_builder/elements/ubuntu-common/environment.d/10-ubuntu-distro-name.bash
similarity index 91%
rename from diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash
rename to diskimage_builder/elements/ubuntu-common/environment.d/10-ubuntu-distro-name.bash
index c6154267..253127e1 100644
--- a/diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash
+++ b/diskimage_builder/elements/ubuntu-common/environment.d/10-ubuntu-distro-name.bash
@@ -1,4 +1,4 @@
-export DISTRO_NAME=ubuntu
+export DISTRO_NAME=${DISTRO_NAME:-ubuntu}
 export DIB_RELEASE=${DIB_RELEASE:-xenial}
 export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,universe}
 
diff --git a/diskimage_builder/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash b/diskimage_builder/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash
deleted file mode 100644
index fa19f207..00000000
--- a/diskimage_builder/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash
+++ /dev/null
@@ -1,2 +0,0 @@
-export DISTRO_NAME=ubuntu
-export DIB_RELEASE=${DIB_RELEASE:-xenial}