diff --git a/openviking/server/bootstrap.py b/openviking/server/bootstrap.py
index 4dd6c334..8d9d95cd 100644
--- a/openviking/server/bootstrap.py
+++ b/openviking/server/bootstrap.py
@@ -12,12 +12,26 @@
 from openviking_cli.utils.logger import configure_uvicorn_logging
 
 
+def _get_version() -> str:
+    try:
+        from openviking import __version__
+
+        return __version__
+    except ImportError:
+        return "unknown"
+
+
 def main():
     """Main entry point for openviking-server command."""
     parser = argparse.ArgumentParser(
         description="OpenViking HTTP Server",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=f"openviking-server {_get_version()}",
+    )
     parser.add_argument(
         "--host",
         type=str,
diff --git a/openviking/service/core.py b/openviking/service/core.py
index 47cf8f71..7b9a35c0 100644
--- a/openviking/service/core.py
+++ b/openviking/service/core.py
@@ -112,7 +112,7 @@ def _init_storage(
         from openviking.utils.agfs_utils import create_agfs_client
 
         mode = getattr(config.agfs, "mode", "http-client")
-        if mode == "http-client" and config.agfs.backend == "local":
+        if mode == "http-client":
             self._agfs_manager = AGFSManager(config=config.agfs)
             self._agfs_manager.start()
             self._agfs_url = self._agfs_manager.url