diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 48f9818886..f570afe886 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -15,6 +15,7 @@ VALID_IMG_TYPES=(
     digitalocean
     exoscale
     gce
+    hetzner
     hyperv
     hyperv_vhdx
     iso
@@ -48,6 +49,7 @@ VALID_OEM_PACKAGES=(
     digitalocean
     exoscale
     gce
+    hetzner
     hyperv
     openstack
     packet
@@ -278,6 +280,12 @@ IMG_azure_OEM_USE=azure
 IMG_azure_OEM_PACKAGE=common-oem-files
 IMG_azure_OEM_SYSEXT=oem-azure
 
+## hetzner
+IMG_hetzner_DISK_LAYOUT=vm
+IMG_hetzner_OEM_USE=hetzner
+IMG_hetzner_OEM_PACKAGE=common-oem-files
+IMG_hetzner_OEM_SYSEXT=oem-hetzner
+
 ## hyper-v
 IMG_hyperv_DISK_FORMAT=vhd
 IMG_hyperv_OEM_PACKAGE=oem-hyperv
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r7.ebuild
similarity index 99%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r6.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r7.ebuild
index c1dd66b61d..d2fae08320 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r6.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r7.ebuild
@@ -31,6 +31,7 @@ fi
 COMMON_OEMIDS=(
     ami
     azure
+    hetzner
     openstack
     packet
     qemu
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/metadata.xml
new file mode 100644
index 0000000000..097975e3ad
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/oem-hetzner-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/oem-hetzner-0.ebuild
new file mode 100644
index 0000000000..78251ef249
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hetzner/oem-hetzner-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OEM suite for Hetzner"
+HOMEPAGE="https://hetzner.com"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+IUSE=""
+
+OEM_NAME="Hetzner"