diff --git a/openflexure_microscope/plugins/default/scan/plugin.py b/openflexure_microscope/plugins/default/scan/plugin.py
index 0f9c09fa..46889e99 100644
--- a/openflexure_microscope/plugins/default/scan/plugin.py
+++ b/openflexure_microscope/plugins/default/scan/plugin.py
@@ -99,9 +99,10 @@ class ScanPlugin(MicroscopePlugin):
 
         metadata.update(
             {
-                "position": self.microscope.state["stage"]["position"],
                 "scan_id": scan_id,
                 "basename": basename,
+                "microscope_settings": self.microscope.read_config(),
+                "microscope_state": self.microscope.state,
                 "microscope_id": self.microscope.id,
                 "microscope_name": self.microscope.name,
             }
@@ -145,6 +146,15 @@ class ScanPlugin(MicroscopePlugin):
         if "time" not in metadata:
             metadata["time"] = generate_basename()
 
+        metadata.update({
+            "scan_parameters": {
+                "step_size": step_size,
+                "grid": grid,
+                "style": style,
+                "autofocus_dz": autofocus_dz
+            }
+        })
+
         # Check if autofocus is enabled
         if (
             autofocus_dz