diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ef8b65..75a6301 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Updated libboost version to 1.81
+- Updated grpc-interfaces
+- Updated machine-emulator-defines
+- Bumped version to 0.9.0
+
+### Added
+- Added \-\-version command line option
 
 ## [0.8.2] - 2023-08-21
 ### Changed
diff --git a/lib/grpc-interfaces b/lib/grpc-interfaces
index cba7c3f..4ec6e66 160000
--- a/lib/grpc-interfaces
+++ b/lib/grpc-interfaces
@@ -1 +1 @@
-Subproject commit cba7c3f1c53b83bee83d8a1e5a1074591279220f
+Subproject commit 4ec6e6620abce44048b9a8493124683ef15e0731
diff --git a/lib/machine-emulator-defines b/lib/machine-emulator-defines
index 4f164a7..c30dfb2 160000
--- a/lib/machine-emulator-defines
+++ b/lib/machine-emulator-defines
@@ -1 +1 @@
-Subproject commit 4f164a788ff34b43c6c070fdc14204cd69110440
+Subproject commit c30dfb2bdfe994396f3e6d8f173b197c1b39785c
diff --git a/src/server-manager.cpp b/src/server-manager.cpp
index ae74c8b..93407a3 100644
--- a/src/server-manager.cpp
+++ b/src/server-manager.cpp
@@ -100,8 +100,8 @@ constexpr const uint64_t ROLLUP_ADVANCE_STATE = 0;
 constexpr const uint64_t ROLLUP_INSPECT_STATE = 1;
 
 static constexpr uint32_t manager_version_major = 0;
-static constexpr uint32_t manager_version_minor = 8;
-static constexpr uint32_t manager_version_patch = 2;
+static constexpr uint32_t manager_version_minor = 9;
+static constexpr uint32_t manager_version_patch = 0;
 static constexpr const char *manager_version_pre_release = "";
 static constexpr const char *manager_version_build = "";
 
@@ -3282,6 +3282,9 @@ where
       passed to the spawned remote cartesi machine
       default: localhost:0
 
+    --version
+      prints the server version number
+
     --help
       prints this message and exits
 
@@ -3289,6 +3292,11 @@ where
         name);
 }
 
+/// \brief Prints server_manager version
+static void print_version() {
+    (void) fprintf(stderr, "%d.%d.%d\n", manager_version_major, manager_version_minor, manager_version_patch);
+}
+
 /// \brief Checks if string matches prefix and captures remaninder
 /// \param pre Prefix to match in str.
 /// \param str Input string
@@ -3345,6 +3353,9 @@ int main(int argc, char *argv[]) try {
             ;
         } else if (stringval("--server-address=", argv[i], &server_address)) {
             ;
+        } else if (strcmp(argv[i], "--version") == 0) {
+            print_version();
+            exit(0);
         } else if (strcmp(argv[i], "--help") == 0) {
             help(argv[0]);
             exit(0);
diff --git a/src/test-server-manager.cpp b/src/test-server-manager.cpp
index 63bced1..d3f5d94 100644
--- a/src/test-server-manager.cpp
+++ b/src/test-server-manager.cpp
@@ -565,12 +565,12 @@ void assert_bool(bool value, const std::string &msg, const std::string &file, in
 #define ASSERT_STATUS_CODE(s, f, v) assert_status_code(s, f, v, __FILE__, __LINE__)
 
 static void test_get_version(const std::function<void(const std::string &title, test_function f)> &test) {
-    test("The server-manager server version should be 0.8.x", [](ServerManagerClient &manager) {
+    test("The server-manager server version should be 0.9.x", [](ServerManagerClient &manager) {
         Versioning::GetVersionResponse response;
         Status status = manager.get_version(response);
         ASSERT_STATUS(status, "GetVersion", true);
         ASSERT((response.version().major() == 0), "Version Major should be 0");
-        ASSERT((response.version().minor() == 8), "Version Minor should be 8");
+        ASSERT((response.version().minor() == 9), "Version Minor should be 9");
     });
 }