diff --git a/src/pybind/mgr/smb/fs.py b/src/pybind/mgr/smb/fs.py
index dc9613f21fc..e072bdfb133 100644
--- a/src/pybind/mgr/smb/fs.py
+++ b/src/pybind/mgr/smb/fs.py
@@ -97,6 +97,15 @@ class CephFSPathResolver:
         )
         return posixpath.join(subvolume_path, path)
 
+    def stat(self, volpath: str, volume: str) -> Dict[str, Any]:
+        with open_filesystem(self._cephfs_client, volume) as fs:
+            log.debug('Performing stat on %r in %r', volpath, volume)
+            return fs.statx(
+                volpath.encode('utf-8'),
+                cephfs.CEPH_STATX_MODE | cephfs.CEPH_STATX_INO,
+                cephfs.AT_SYMLINK_NOFOLLOW,
+            )
+
     def resolve_exists(
         self, volume: str, subvolumegroup: str, subvolume: str, path: str
     ) -> str:
@@ -105,34 +114,29 @@ class CephFSPathResolver:
         when the path is not valid.
         """
         volpath = self.resolve(volume, subvolumegroup, subvolume, path)
-        with open_filesystem(self._cephfs_client, volume) as fs:
-            log.debug('checking if %r is a dir in %r', volpath, volume)
-            try:
-                stx = fs.statx(
-                    volpath.encode('utf-8'),
-                    cephfs.CEPH_STATX_MODE,
-                    cephfs.AT_SYMLINK_NOFOLLOW,
-                )
-            except (cephfs.ObjectNotFound, OSError) as err:
-                log.info('%r failed to stat: %s', volpath, err)
-                raise FileNotFoundError(volpath)
-            if not stat.S_ISDIR(stx.get('mode')):
-                log.info('%r is not a directory', volpath)
-                raise NotADirectoryError(volpath)
+        log.debug('checking if %r is a dir in %r', volpath, volume)
+        try:
+            stx = self.stat(volpath, volume)
+        except (cephfs.ObjectNotFound, OSError) as err:
+            log.info('%r failed to stat: %s', volpath, err)
+            raise FileNotFoundError(volpath)
+        if not stat.S_ISDIR(stx.get('mode')):
+            log.info('%r is not a directory', volpath)
+            raise NotADirectoryError(volpath)
         log.debug('Verified that %r exists in %r', volpath, volume)
         return volpath
 
 
 class _TTLCache:
     def __init__(self, maxsize: int = 512, ttl: float = 300.0) -> None:
-        self.cache: Dict[Tuple[str, str, str], Tuple[str, float]] = {}
+        self.cache: Dict[Tuple[str, str, str, str], Tuple[Any, float]] = {}
         self.maxsize: int = maxsize
         self.ttl: float = ttl
 
     def _evict(self) -> None:
         """Evicts items that have expired or if cache size exceeds maxsize."""
         current_time: float = time.monotonic()
-        keys_to_evict: list[Tuple[str, str, str]] = [
+        keys_to_evict: list[Tuple[str, str, str, str]] = [
             key
             for key, (_, timestamp) in self.cache.items()
             if current_time - timestamp > self.ttl
@@ -147,7 +151,7 @@ class _TTLCache:
             ]:
                 del self.cache[key]
 
-    def get(self, key: Tuple[str, str, str]) -> Optional[str]:
+    def get(self, key: Tuple[str, str, str, str]) -> Optional[Any]:
         """Retrieve item from cache if it exists and is not expired."""
         self._evict()  # Ensure expired items are removed
         if key in self.cache:
@@ -155,7 +159,7 @@ class _TTLCache:
             return value
         return None
 
-    def set(self, key: Tuple[str, str, str], value: str) -> None:
+    def set(self, key: Tuple[str, str, str, str], value: Any) -> None:
         """Set item in cache, evicting expired or excess items."""
         self._evict()  # Ensure expired items are removed
         self.cache[key] = (value, time.monotonic())
@@ -204,3 +208,18 @@ class CachingCephFSPathResolver(CephFSPathResolver):
         )
         self._cache.set(cache_key, resolved_path)
         return resolved_path
+
+    def stat(
+        self, volume: str, subvolumegroup: str, subvolume: str, path: str
+    ) -> Dict[str, Any]:
+        cache_key = (volume, subvolumegroup, subvolume, path)
+        cached_stat = self._cache.get(cache_key)
+        if cached_stat:
+            log.debug("Cache hit for key: %r", cache_key)
+            return cached_stat
+
+        log.debug("Cache miss for key: %r", cache_key)
+        volpath = super().resolve(volume, subvolumegroup, subvolume, path)
+        stat_data = super().stat(volpath, volume)
+        self._cache.set(cache_key, stat_data)
+        return stat_data
diff --git a/src/pybind/mgr/smb/handler.py b/src/pybind/mgr/smb/handler.py
index d7e2aef1420..52a2de7b431 100644
--- a/src/pybind/mgr/smb/handler.py
+++ b/src/pybind/mgr/smb/handler.py
@@ -1173,6 +1173,15 @@ def _generate_share(
         share.cephfs.subvolume,
         share.cephfs.path,
     )
+
+    subvol_stat = resolver.stat(
+        share.cephfs.volume,
+        share.cephfs.subvolumegroup,
+        share.cephfs.subvolume,
+        "",
+    )
+    snap_suffix = subvol_stat['ino'] - 1;
+
     try:
         ceph_vfs = {
             CephFSStorageProvider.SAMBA_VFS_CLASSIC: 'ceph',
@@ -1188,6 +1197,10 @@ def _generate_share(
             'path': path,
             "vfs objects": f"acl_xattr shadow_copy2 {ceph_vfs}",
             'acl_xattr:security_acl_name': 'user.NTACL',
+            'shadow:snapdir': '.snap',
+            'shadow:format': f"_GMT_%Y.%m.%d-%H.%M.%S_{snap_suffix}",
+            'shadow:snapdirseverywhere': 'yes',
+            'shadow:snapprefix': '^_[A-Za-z0-9]\+$',
             f'{ceph_vfs}:config_file': '/etc/ceph/ceph.conf',
             f'{ceph_vfs}:filesystem': share.cephfs.volume,
             f'{ceph_vfs}:user_id': cephx_entity,