diff --git a/ceph-16.2.7-596-g7d574789716.tar.bz2 b/ceph-16.2.7-596-g7d574789716.tar.bz2
deleted file mode 100644
index 01b09c3..0000000
--- a/ceph-16.2.7-596-g7d574789716.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfaf452cc8f4d13466743ef173cc19379e34757e576b70e213836cfefc3505ac
-size 128384155
diff --git a/ceph-16.2.7-640-gceb23c7491b.tar.bz2 b/ceph-16.2.7-640-gceb23c7491b.tar.bz2
new file mode 100644
index 0000000..d718173
--- /dev/null
+++ b/ceph-16.2.7-640-gceb23c7491b.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:acb28bd4f21d111b6c6f5ceb3f96deac4e9588c9bb573c1531782d0ac342f8d5
+size 128473591
diff --git a/ceph-test.changes b/ceph-test.changes
index 67e5509..9b75831 100644
--- a/ceph-test.changes
+++ b/ceph-test.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 15 19:31:58 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
+
+- Update to 16.2.7-640-gceb23c7491b
+  + (bsc#1194875) common: fix FTBFS due to dout & need_dynamic on GCC-12
+  + (bsc#1196938) cephadm: preserve authorized_keys file during upgrade
+
 -------------------------------------------------------------------
 Tue Mar  8 22:33:00 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
 
diff --git a/ceph-test.spec b/ceph-test.spec
index 32bec76..778ac40 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -125,7 +125,7 @@
 # main package definition
 #################################################################################
 Name: ceph-test
-Version: 16.2.7.596+g7d574789716
+Version: 16.2.7.640+gceb23c7491b
 Release: 0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
@@ -141,7 +141,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 Group: System/Filesystems
 %endif
 URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-16.2.7-596-g7d574789716.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-16.2.7-640-gceb23c7491b.tar.bz2
 %if 0%{?suse_version}
 Source94: ceph-rpmlintrc
 Source95: checkin.sh
@@ -586,7 +586,7 @@ This package contains Ceph benchmarks and test tools.
 %if 0%{?suse_version}
 %endif
 %prep
-%autosetup -p1 -n ceph-16.2.7-596-g7d574789716
+%autosetup -p1 -n ceph-16.2.7-640-gceb23c7491b
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed:
diff --git a/ceph.changes b/ceph.changes
index 67e5509..9b75831 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 15 19:31:58 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
+
+- Update to 16.2.7-640-gceb23c7491b
+  + (bsc#1194875) common: fix FTBFS due to dout & need_dynamic on GCC-12
+  + (bsc#1196938) cephadm: preserve authorized_keys file during upgrade
+
 -------------------------------------------------------------------
 Tue Mar  8 22:33:00 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
 
diff --git a/ceph.spec b/ceph.spec
index 9f79e20..ee00b00 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -125,7 +125,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	16.2.7.596+g7d574789716
+Version:	16.2.7.640+gceb23c7491b
 Release:	0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -141,7 +141,7 @@ License:	LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
-Source0:	%{?_remote_tarball_prefix}ceph-16.2.7-596-g7d574789716.tar.bz2
+Source0:	%{?_remote_tarball_prefix}ceph-16.2.7-640-gceb23c7491b.tar.bz2
 %if 0%{?suse_version}
 # _insert_obs_source_lines_here
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x
@@ -1199,7 +1199,7 @@ This package provides Ceph default alerts for Prometheus.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-16.2.7-596-g7d574789716
+%autosetup -p1 -n ceph-16.2.7-640-gceb23c7491b
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed:
@@ -1550,7 +1550,7 @@ exit 0
 %{_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
+%config(noreplace) %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
 
 %files common
 %dir %{_docdir}/ceph