diff --git a/.ceph.metadata b/.ceph.metadata
index 7d10768..bcf77bd 100644
--- a/.ceph.metadata
+++ b/.ceph.metadata
@@ -1 +1 @@
-2eb3d38288df77154e7515b28b8eb27cb267a190  SOURCES/ceph-17.1.0.tar.gz
+9724d3d1857e95b2df6053240b224b14c171733c  SOURCES/ceph-17.1.0-123-g14f44feb.tar.bz2
diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec
index cec1240..a908c80 100644
--- a/SPECS/ceph.spec
+++ b/SPECS/ceph.spec
@@ -24,6 +24,7 @@
 
 %undefine __cmake_in_source_build
 
+%bcond_without cephadm
 %bcond_with make_check
 %bcond_with zbd
 %bcond_with cmake_verbose_logging
@@ -152,7 +153,7 @@
 #################################################################################
 Name:		ceph
 Version:	17.1.0
-Release:	0.3.rc1%{?dist}
+Release:	0.7.123.g14f44feb%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -168,7 +169,8 @@ License:	(LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost-1.0 and BSD an
 Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
-Source0:	ceph-17.1.0.tar.gz
+#Source0:	ceph-17.1.0.tar.gz
+Source0:	ceph-17.1.0-123-g14f44feb.tar.bz2
 Patch0001:	0001-src-common-crc32c_intel_fast.patch
 Patch0003:	0003-src-common-bitstr.h.patch
 Patch0008:	0008-cmake-modules-Finduring.cmake.patch
@@ -178,7 +180,7 @@ Patch0012:	0012-spdk-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assemb.patch
 Patch0016:	0016-src-tracing-patch
 Patch0017:	0017-gcc-12-omnibus.patch
 Patch0018:	0018-src-rgw-store-dbstore-CMakeLists.txt.patch
-# Source1:	cmake-modules-BuildBoost.cmake.noautopatch
+
 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
 %if 0%{?suse_version}
@@ -488,6 +490,7 @@ Recommends:	smartmontools
 %description base
 Base is the package that includes all the files shared amongst ceph servers
 
+%if 0%{with cephadm}
 %package -n cephadm
 Summary:	Utility to bootstrap Ceph clusters
 BuildArch:	noarch
@@ -501,6 +504,7 @@ Recommends:	podman >= 2.0.2
 %description -n cephadm
 Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed
 with systemd and podman.
+%endif
 
 %package -n ceph-common
 Summary:	Ceph Common
@@ -1250,10 +1254,7 @@ This package provides Ceph default alerts for Prometheus.
 # common
 #################################################################################
 %prep
-%autosetup -p1
-# %%ifarch x86_64
-# patch -p1 < %{SOURCE1}
-# %%endif
+%autosetup -p1 -n ceph-17.1.0-123-g14f44feb
 
 %build
 # Disable lto on systems that do not support symver attribute
@@ -1297,7 +1298,6 @@ mkdir -p %{_vpath_builddir}
 %{cmake} . \
     -GNinja \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \
     -DBUILD_CONFIG=rpmbuild \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
     -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
@@ -1431,6 +1431,7 @@ install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
 install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
 install -m 0755 -D src/tools/rbd_nbd/rbd-nbd_quiesce %{buildroot}%{_libexecdir}/rbd-nbd/rbd-nbd_quiesce
 
+%if 0%{with cephadm}
 install -m 0755 src/cephadm/cephadm %{buildroot}%{_sbindir}/cephadm
 mkdir -p %{buildroot}%{_sharedstatedir}/cephadm
 chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm
@@ -1438,6 +1439,7 @@ mkdir -p %{buildroot}%{_sharedstatedir}/cephadm/.ssh
 chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm/.ssh
 touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
 chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
+%endif
 
 # firewall templates and /sbin/mount.ceph symlink
 %if 0%{?suse_version} && !0%{?usrmerged}
@@ -1489,6 +1491,10 @@ install -m 644 -D monitoring/ceph-mixin/prometheus_alerts.yml %{buildroot}/etc/p
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
 %endif
 
+%if 0%{without cephadm}
+rm -f %{buildroot}%{_mandir}/man8/cephadm.8*
+%endif
+
 #################################################################################
 # files and systemd scriptlets
 #################################################################################
@@ -1572,23 +1578,29 @@ fi
 /sbin/ldconfig
 %systemd_postun ceph.target
 
+%if 0%{with cephadm}
 %pre -n cephadm
 getent group cephadm >/dev/null || groupadd -r cephadm
 getent passwd cephadm >/dev/null || useradd -r -g cephadm -s /bin/bash -c "cephadm user for mgr/cephadm" -d %{_sharedstatedir}/cephadm cephadm
 exit 0
+%endif
 
+%if 0%{with cephadm}
 %if ! 0%{?suse_version}
 %postun -n cephadm
 userdel -r cephadm || true
 exit 0
 %endif
+%endif
 
+%if 0%{with cephadm}
 %files -n cephadm
 %{_sbindir}/cephadm
 %{_mandir}/man8/cephadm.8*
 %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm
 %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh
 %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
+%endif
 
 %files common
 %dir %{_docdir}/ceph
@@ -2550,8 +2562,17 @@ exit 0
 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
 
 %changelog
+* Mon Mar 28 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.1.0-0.5.123.g14f44feb
+- 17.1.0 snapshot 123
+
+* Mon Mar 21 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.1.0-0.5.56-g60fdd357
+- 17.1.0 snapshot 56
+
 * Wed Mar 2 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.1.0-0.3.rc1
-- 17.1.0 RC1, w/o cephadm
+- 17.1.0, w/o cephadm
+
+* Tue Mar 1 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.1.0-0.2.rc1
+- 17.1.0 revised patch
 
 * Mon Feb 28 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.1.0-0.1.rc1
 - 17.1.0 RC1