diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest
new file mode 100644
index 0000000000..b864dd3ef3
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest
@@ -0,0 +1 @@
+DIST ignition-2.22.0.tar.gz 8262012 BLAKE2B f6406c88a9085dcc2c75a28a31ff9a67377745c55cc909e6e1fd4443f522004bc4a5c3d7c41d317e81b014dea2b96a16cbe4072173b8af7a6db7081b45741d01 SHA512 fd9fbe28b77c0593c4ca3f7d08fcb46c56c29d8fd4365c37856b8ccfd178d3cbb44dbe15effcfada3da851bece893edfe2b4de2c4873a90c909322a8c806143a
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.21.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.21.0-r1.ebuild
deleted file mode 120000
index edd426c8cd..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.21.0-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-ignition-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.22.0.ebuild
similarity index 75%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.22.0.ebuild
index 751fbc4414..f9e8fa4145 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.22.0.ebuild
@@ -1,22 +1,14 @@
 # Copyright (c) 2015 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-EGIT_REPO_URI="https://github.com/coreos/ignition.git"
-COREOS_GO_PACKAGE="github.com/flatcar/ignition/v2"
-COREOS_GO_GO111MODULE="off"
-inherit coreos-go git-r3 systemd udev
+EAPI=8
+inherit go-module
 
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm64"
-else
-	EGIT_COMMIT="fc324e12230b036ce9d44f64346780121431ff27" # v2.21.0
-	KEYWORDS="amd64 arm64"
-fi
+KEYWORDS="amd64 arm64"
 
 DESCRIPTION="Pre-boot provisioning utility"
 HOMEPAGE="https://github.com/coreos/ignition"
-SRC_URI=""
+SRC_URI="https://github.com/coreos/ignition/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PVR}"
@@ -63,13 +55,13 @@ PATCHES=(
 )
 
 src_compile() {
-	export GO15VENDOREXPERIMENT="1"
-	GO_LDFLAGS="-X github.com/flatcar/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar/ignition/v2/internal/distro.selinuxRelabel=false" || die
-	go_build "${COREOS_GO_PACKAGE}/internal"
+	ego build \
+		-ldflags "-X github.com/flatcar/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar/ignition/v2/internal/distro.selinuxRelabel=false" \
+		"${S}/internal/main.go"
 }
 
 src_install() {
-	newbin ${GOBIN}/internal ${PN}
+	newbin "${S}/main" "${PN}"
 
 	dosym "/usr/bin/${PN}" "/usr/libexec/${PN}-rmcfg"
 }