diff --git a/elements/base/pre-install.d/03-baseline-tools b/elements/base/pre-install.d/03-baseline-tools
index e7eac4b0..e111f5bf 100755
--- a/elements/base/pre-install.d/03-baseline-tools
+++ b/elements/base/pre-install.d/03-baseline-tools
@@ -4,11 +4,8 @@
 set -eu
 set -o pipefail
 
-# If lsb_release is missing, just do nothing.
-DISTRO=`lsb_release -si` || true
-
-case $DISTRO in
-    'Ubuntu'|'Debian')
+case $DISTRO_NAME in
+    'ubuntu'|'debian')
         # Note: add-apt-repository would be nice for RPM platforms too - so when we
         # need something like it, create a wrapper in dpkg/bin and fedora/bin.
         apt-get -y update
diff --git a/elements/ramdisk/install.d/20-install-dhcp-client b/elements/ramdisk/install.d/20-install-dhcp-client
index 5b52bc1a..98fc31d6 100755
--- a/elements/ramdisk/install.d/20-install-dhcp-client
+++ b/elements/ramdisk/install.d/20-install-dhcp-client
@@ -2,8 +2,6 @@
 set -eux
 set -o pipefail
 
-DISTRO=`lsb_release -si` || true
-
-if [ "openSUSE project" = "$DISTRO" ]; then
+if [ "opensuse" = "$DISTRO_NAME" ]; then
     install-packages dhcp-client
 fi