diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index e0adb9543f..947577f4e1 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -282,7 +282,9 @@ IMG_cloudstack_vhd_DISK_FORMAT=vhd
 IMG_cloudstack_vhd_OEM_PACKAGE=oem-cloudstack
 
 ## digitalocean
-IMG_digitalocean_OEM_PACKAGE=oem-digitalocean
+IMG_digitalocean_OEM_PACKAGE=common-oem-files
+IMG_digitalocean_OEM_USE=digitalocean
+IMG_digitalocean_OEM_SYSEXT=oem-digitalocean
 
 ## exoscale
 IMG_exoscale_DISK_FORMAT=qcow2
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r3.ebuild
similarity index 99%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r3.ebuild
index 124bb73471..4bac0cf199 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r3.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 OEMIDS=(
     ami
     azure
+    digitalocean
     openstack
     qemu
     vmware
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/digitalocean b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/digitalocean
new file mode 100644
index 0000000000..c5f3a2a8b7
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/digitalocean
@@ -0,0 +1,2 @@
+/etc/systemd/system/multi-user.target.requires/coreos-metadata-sshkeys@core.service
+/oem/base/
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/base/README b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/base/README
deleted file mode 100644
index d128309fef..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/base/README
+++ /dev/null
@@ -1,4 +0,0 @@
-These Ignition configs are part of the OEM configuration. Do not modify
-them. If you want to write an Ignition config directly to disk, put it in
-../config.ign and it will be applied at first boot instead of a config
-in userdata.
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/base/base.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/base/base.ign
deleted file mode 100644
index bfcfd84e05..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/base/base.ign
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "ignition": {
-    "version": "2.1.0"
-  },
-  "systemd": {
-    "units": [
-      {
-        "name": "coreos-metadata-sshkeys@.service",
-        "enabled": true
-      }
-    ]
-  }
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg
deleted file mode 100644
index a595676b61..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Flatcar GRUB settings
-
-set oem_id="digitalocean"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/oem-release
deleted file mode 100644
index 3d6d250197..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/oem-release
+++ /dev/null
@@ -1,5 +0,0 @@
-ID=digitalocean
-VERSION_ID=@@OEM_VERSION_ID@@
-NAME="DigitalOcean"
-HOME_URL="https://www.digitalocean.com/"
-BUG_REPORT_URL="https://issues.flatcar.org"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1-r1.ebuild
deleted file mode 100644
index 1bd353155f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="OEM suite for DigitalOcean images"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# no source directory
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
-	    "${FILESDIR}/oem-release" > "${T}/oem-release" || die
-}
-
-src_install() {
-	insinto "/oem"
-	doins "${FILESDIR}/grub.cfg"
-	doins "${T}/oem-release"
-	doins -r "${FILESDIR}/base"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1-r2.ebuild
new file mode 100644
index 0000000000..6a1cbc3f37
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright (c) 2020 Kinvolk GmbH. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="DigitalOcean suite for DigitalOcean"
+HOMEPAGE="https://www.digitalocean.com/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+IUSE=""
+
+OEM_NAME="DigitalOcean"