diff --git a/subiquity/cmd/server.py b/subiquity/cmd/server.py
index 6fd6e693..a0928717 100644
--- a/subiquity/cmd/server.py
+++ b/subiquity/cmd/server.py
@@ -159,10 +159,11 @@ def main():
 
     logger = logging.getLogger('subiquity')
     version = os.environ.get("SNAP_REVISION", "unknown")
-    logger.info("Starting Subiquity server revision {}".format(version))
-    logger.info("Arguments passed: {}".format(sys.argv))
-    logger.debug("Kernel commandline: {}".format(opts.kernel_cmdline))
-    logger.debug("Storage version: {}".format(opts.storage_version))
+    snap = os.environ.get("SNAP", "unknown")
+    logger.info(f"Starting Subiquity server revision {version} of snap {snap}")
+    logger.info(f"Arguments passed: {sys.argv}")
+    logger.debug(f"Kernel commandline: {opts.kernel_cmdline}")
+    logger.debug(f"Environment: {os.environ}")
 
     async def run_with_loop():
         server = SubiquityServer(opts, block_log_dir)
diff --git a/subiquity/cmd/tui.py b/subiquity/cmd/tui.py
index 947fe3f7..f9d20c82 100755
--- a/subiquity/cmd/tui.py
+++ b/subiquity/cmd/tui.py
@@ -113,8 +113,10 @@ def main():
 
     logger = logging.getLogger('subiquity')
     version = os.environ.get("SNAP_REVISION", "unknown")
-    logger.info("Starting Subiquity revision {}".format(version))
-    logger.info("Arguments passed: {}".format(sys.argv))
+    snap = os.environ.get("SNAP", "unknown")
+    logger.info(f"Starting Subiquity TUI revision {version} of snap {snap}")
+    logger.info(f"Arguments passed: {sys.argv}")
+    logger.debug(f"Environment: {os.environ}")
 
     if opts.answers is None and os.path.exists(AUTO_ANSWERS_FILE):
         logger.debug("Autoloading answers from %s", AUTO_ANSWERS_FILE)