diff --git a/.gitignore b/.gitignore
index caa7256..1e0ad4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,9 @@
 /sevctl-0.3.0.tar.gz
 /sevctl-0.3.2-vendor.tar.gz
 /sevctl-0.3.2.tar.gz
+/sevctl-0.4.1.tar.gz
+/sevctl-0.4.1-vendor.tar.gz
+/snpguest-0.2.2.tar.gz
+/snpguest-0.2.2-vendor.tar.gz
+/snphost-0.1.1.tar.gz
+/snphost-0.1.1-vendor.tar.gz
diff --git a/sevctl.spec b/sevctl.spec
index 8f17b91..f265b92 100644
--- a/sevctl.spec
+++ b/sevctl.spec
@@ -1,63 +1,126 @@
 Name:           sevctl
-Version:        0.3.2
+Version:        0.4.1
 Release:        1%{?dist}
-Summary:        Administrative utility for AMD SEV
+Summary:        Administrative utilities for AMD SEV and SEV-SNP
 
 License:        ASL 2.0
-URL:            https://github.com/enarx/sevctl
-Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+URL:            https://github.com/virtee
+
+# sevctl sources
+Source0:        %{url}/sevctl/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}-vendor.tar.gz
 
+# snphost sources
+Source2:        %{url}/snphost/archive/v0.1.1/snphost-0.1.1.tar.gz
+Source3:        snphost-0.1.1-vendor.tar.gz
+
+# snpguest sources
+Source4:        %{url}/snpguest/archive/v0.2.2/snpguest-0.2.2.tar.gz
+Source5:        snpguest-0.2.2-vendor.tar.gz
+
 ExclusiveArch:  x86_64
 BuildRequires:  rust-toolset
 BuildRequires:  openssl-devel
 
+%package sevctl
+Summary: %{summary}
+
+%description sevctl
+%{summary}.
+
+%files -n sevctl
+%doc sevctl-0.4.1/README.md
+%license sevctl-0.4.1/LICENSE
+%{_bindir}/sevctl
+
+%package snphost
+Summary: %{summary}
+
+%description snphost
+%{summary}.
+
+%files snphost
+%doc snphost-0.1.1/README.md
+%license snphost-0.1.1/LICENSE
+%{_bindir}/snphost
+
+%package snpguest
+Summary: %{summary}
+
+%description snpguest
+%{summary}.
+
+%files snpguest
+%doc snpguest-0.2.2/README.md
+%license snpguest-0.2.2/LICENSE
+%{_bindir}/snpguest
+
 %description
 %{summary}.
 
-
 %prep
-%setup -q -n %{name}-%{version}
+%setup -n sevctl-build -c -a 2 -a 4
 
+pushd sevctl-0.4.1
 %cargo_prep -V 1
+popd
 
+pushd snphost-0.1.1
+%cargo_prep -V 3
+popd
+
+pushd snpguest-0.2.2
+%cargo_prep -V 5
+popd
 
 %build
-%cargo_build
 
+pushd sevctl-0.4.1
+%cargo_build
+popd
+
+pushd snphost-0.1.1
+%cargo_build
+popd
+
+pushd snpguest-0.2.2
+%cargo_build
+popd
 
 %install
+
+pushd sevctl-0.4.1
 %cargo_install
+popd
 
+pushd snphost-0.1.1
+%cargo_install
+popd
 
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/%{name}
-
+pushd snpguest-0.2.2
+%cargo_install
+popd
 
 %changelog
-* Tue Nov 29 2022 Tyler Fanelli <tfanelli@redhat.com> - 0.3.2
+* Mon Jul 10 2023 Tyler Fanelli <tfanelli@redhat.com>
+- Rebase to 0.4.1
+- Add snphost and snpguest CLI utilities along with sevctl
+- Related: rhbz2222043
+
+* Mon Nov 28 2022 Tyler Fanelli <tfanelli@redhat.com>
 - Rebase to 0.3.2
-- Related: bz#2135744
+- Related: rhbz2135747
 
-* Sat Jul 2 2022 Tyler Fanelli <tfanelli@redhat.com> - 0.3.0
+* Fri Jul 1 2022 Tyler Fanelli <tfanelli@redhat.com>
 - Rebase to 0.3.0
-- Related: bz#2085085
+- Related: rhbz2085086
 
-* Mon Jan 31 2022 Tyler Fanelli <tfanelli@redhat.com> - 0.2.0
+* Thu Jan 27 2022 Tyler Fanelli <tfanelli@redhat.com>
 - Rebase to 0.2.0
-- Related: bz#2037953
-- Remove OpenSSL 3 re-vendor.
+- Related: rhbz2037961
 
-* Tue Nov 09 2021 Miroslav Rezanina <mrezanin@redhat.com> - 0.1.0-4
-- Rebuild for RHEL 9
-
-* Thu Aug 26 2021 Connor Kuehl <ckuehl@redhat.com> - 0.1.0-3
-- No-change rebuild to pick up gating.yaml
-
-* Thu Aug 19 2021 Connor Kuehl <ckuehl@redhat.com> - 0.1.0-2
-- Re-vendor for OpenSSL 3 compatible rust-openssl package
+* Thu Aug 26 2021 Connor Kuehl <ckuehl@redhat.com> - 0.1.0-2
+- No-change rebuild for gating.yaml
 
 * Wed Apr 14 2021 Connor Kuehl <ckuehl@redhat.com>
 - Initial package
diff --git a/sources b/sources
index 749b189..7ddeb83 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,8 @@
 SHA512 (sevctl-0.3.2-vendor.tar.gz) = 3aa5c2d97dae7675afbe91e8034caadab3344c947c3261798f45fd51d2019999654998e751dfcc3a0e9b1051c5b31a7e251f1ca9d41a5bfa67317250955d7e62
 SHA512 (sevctl-0.3.2.tar.gz) = e23c47a6fa6e5ea6db07e69b72b875089d11b7d99839e5971551a2edafdbf26da872bc2d9efd177393874e07d2299948370676453bfd9bbf0ec02c1f756485fc
+SHA512 (sevctl-0.4.1.tar.gz) = 5f995122a5c2849011d3f409e5051719a36951dbccb35cccac7de589ba0e7a724cebabe9026aeb0e1bbda6959bc182d154436042df0330d0e00796424a5843f0
+SHA512 (sevctl-0.4.1-vendor.tar.gz) = fb8a43d377472826f91d51185273645f04d544fcc96ed01729249ace6026f07e44ebcc464070d9f89e1f9d67918971b3ad0ca17c16940e3af5d6458619f9875c
+SHA512 (snpguest-0.2.2.tar.gz) = 3870530039ad4b9f5241d8845be0dc2e30c001f8eccae17bcc8546fee31350596d1bb141808b9a64fbb65908eee993ccb6b4ac3a5881938f6ce11e1e71c04059
+SHA512 (snpguest-0.2.2-vendor.tar.gz) = 846c6a315570a6f7a73be245c2200a70a8c6376103408b9ca96b1787760c58ae302629cb05933e58751140fe9415dbbccb924d483b65e9cce317b500cacad957
+SHA512 (snphost-0.1.1.tar.gz) = 77066f61136e3dcfe6a17b320bc2f2ddab89d27c00f9f5594a78168b066224de6c901d735347075acff09af62b929c5a1a131aa594e849a29dbe1ad32e44faba
+SHA512 (snphost-0.1.1-vendor.tar.gz) = 408d93032fc4ae4de26541ff7d8cccd8805ab9f0c7ad3ae2f457ad854ce46f5b79d7491fc42e0c4b8869752209a7bc50602c66dad48d6306902f75db30dd0d30