diff --git a/elements/base/install.d/00-ccache b/elements/base/install.d/00-ccache
deleted file mode 100755
index 8a581105..00000000
--- a/elements/base/install.d/00-ccache
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages -m base ccache_package
diff --git a/elements/base/package-installs.yaml b/elements/base/package-installs.yaml
new file mode 100644
index 00000000..afe7c77a
--- /dev/null
+++ b/elements/base/package-installs.yaml
@@ -0,0 +1 @@
+ccache_package:
diff --git a/elements/ubuntu/install.d/10-support-physical-hardware b/elements/ubuntu/install.d/10-support-physical-hardware
deleted file mode 100755
index 08d4d543..00000000
--- a/elements/ubuntu/install.d/10-support-physical-hardware
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-# Ubuntu's cloud images don't include drivers for real hardware.
-install-packages linux-image-generic
-
diff --git a/elements/ubuntu/package-installs.yaml b/elements/ubuntu/package-installs.yaml
new file mode 100644
index 00000000..83f64fcc
--- /dev/null
+++ b/elements/ubuntu/package-installs.yaml
@@ -0,0 +1 @@
+linux-image-generic: