diff --git a/src/xconfluencebuilder/__init__.py b/src/xconfluencebuilder/__init__.py
index f4efc0c..68b8e17 100644
--- a/src/xconfluencebuilder/__init__.py
+++ b/src/xconfluencebuilder/__init__.py
@@ -228,16 +228,11 @@ class ConfluencePublisher(_ConfluencePublisher):
         """
         logger.info('pass-through intercept: store_attachment')
 
-        # 😭 i wanted to use this method so bad, but since we're ditching
-        # hashing altogether, this isn't necessary. We'll keep it as an
-        # orbituary 🪦
-        # mime_extension = guess_extension(mimetype, False)
-
         file_name = quote_plus(name)
 
         output_basepath = Path(getattr(self.config, 'xconfluence_outdir'))
 
-        file_ = output_basepath / 'attachments' / file_name
+        file_ = output_basepath / 'attachments' / quote_plus(page_id) / file_name
 
         file_.parent.mkdir(parents = True, exist_ok = True)