diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r40.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r41.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r40.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r41.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
index 083db0e566..f66fe8c1d9 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 	dev-libs/nss
 	dev-python/setuptools
 	dev-util/boost-build
+	dev-util/catalyst
 	dev-util/checkbashisms
 	dev-util/patchelf
 	dev-vcs/repo
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r4.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1-r4.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild
index 7dc2a6474c..ae0d5e61d2 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild
@@ -37,8 +37,3 @@ RDEPEND="
 	dev-python/awscli
 	sys-apps/ed
 "
-
-# Needed for Jenkins
-RDEPEND+="
-	dev-util/catalyst
-"
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1
index 34612924be..56b9c8cfc5 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
-DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/fero-client coreos-devel/kola-data coreos-devel/mantle dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
+DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/fero-client coreos-devel/kola-data coreos-devel/mantle dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/catalyst dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
 DESCRIPTION=Meta ebuild for everything that needs to be in the SDK.
 EAPI=5
 HOMEPAGE=http://coreos.com/docs/sdk/
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/fero-client coreos-devel/kola-data coreos-devel/mantle dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
+RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/fero-client coreos-devel/kola-data coreos-devel/mantle dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/catalyst dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
 SLOT=0
-_md5_=de6deb38031fca99616e613a601d3a14
+_md5_=061ce47321478f92fb9f65ae0f53f5ff
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r40 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r41
similarity index 52%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r40
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r41
index 34612924be..56b9c8cfc5 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r40
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r41
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
-DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/fero-client coreos-devel/kola-data coreos-devel/mantle dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
+DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/fero-client coreos-devel/kola-data coreos-devel/mantle dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/catalyst dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
 DESCRIPTION=Meta ebuild for everything that needs to be in the SDK.
 EAPI=5
 HOMEPAGE=http://coreos.com/docs/sdk/
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/fero-client coreos-devel/kola-data coreos-devel/mantle dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
+RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/fero-client coreos-devel/kola-data coreos-devel/mantle dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/catalyst dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1
 SLOT=0
-_md5_=de6deb38031fca99616e613a601d3a14
+_md5_=061ce47321478f92fb9f65ae0f53f5ff
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1
index 71d792eee3..de5a8d4b48 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1
@@ -4,6 +4,6 @@ EAPI=5
 HOMEPAGE=http://coreos.com/docs/sdk/
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=app-admin/python-updater app-crypt/efitools app-crypt/tpm-tools app-editors/emacs app-editors/nano app-portage/eix app-portage/gentoolkit-dev app-portage/repoman app-misc/screen app-misc/tmux app-text/tree app-text/dos2unix dev-util/cscope dev-util/perf dev-util/strace dev-util/valgrind dev-go/glide dev-go/godep dev-python/awscli sys-apps/ed dev-util/catalyst
+RDEPEND=app-admin/python-updater app-crypt/efitools app-crypt/tpm-tools app-editors/emacs app-editors/nano app-portage/eix app-portage/gentoolkit-dev app-portage/repoman app-misc/screen app-misc/tmux app-text/tree app-text/dos2unix dev-util/cscope dev-util/perf dev-util/strace dev-util/valgrind dev-go/glide dev-go/godep dev-python/awscli sys-apps/ed
 SLOT=0
-_md5_=7c6172a5a026e0db5db39fb4227f1af0
+_md5_=f70c50a2608fa2c35d9df0fc07eb96f4
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r4
similarity index 85%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r3
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r4
index 71d792eee3..de5a8d4b48 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-extras-0.0.1-r4
@@ -4,6 +4,6 @@ EAPI=5
 HOMEPAGE=http://coreos.com/docs/sdk/
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=app-admin/python-updater app-crypt/efitools app-crypt/tpm-tools app-editors/emacs app-editors/nano app-portage/eix app-portage/gentoolkit-dev app-portage/repoman app-misc/screen app-misc/tmux app-text/tree app-text/dos2unix dev-util/cscope dev-util/perf dev-util/strace dev-util/valgrind dev-go/glide dev-go/godep dev-python/awscli sys-apps/ed dev-util/catalyst
+RDEPEND=app-admin/python-updater app-crypt/efitools app-crypt/tpm-tools app-editors/emacs app-editors/nano app-portage/eix app-portage/gentoolkit-dev app-portage/repoman app-misc/screen app-misc/tmux app-text/tree app-text/dos2unix dev-util/cscope dev-util/perf dev-util/strace dev-util/valgrind dev-go/glide dev-go/godep dev-python/awscli sys-apps/ed
 SLOT=0
-_md5_=7c6172a5a026e0db5db39fb4227f1af0
+_md5_=f70c50a2608fa2c35d9df0fc07eb96f4