diff --git a/controller/src/main.rs b/controller/src/main.rs
index b9e7226..5c9577a 100644
--- a/controller/src/main.rs
+++ b/controller/src/main.rs
@@ -36,6 +36,7 @@ struct Cli {}
 #[derive(Serialize, JsonSchema)]
 struct VersionInfo {
     name: String,
+    version: String,
 }
 
 /// Fetch version info.
@@ -57,7 +58,8 @@ async fn api_version(
     rqctx: RequestContext<Arc<()>>,
 ) -> Result<HttpResponseOk<VersionInfo>, HttpError> {
     let ver = VersionInfo {
-        name: String::from("patagia-controller"),
+        name: env!("CARGO_PKG_NAME").to_string(),
+        version: env!("CARGO_PKG_VERSION").to_string(),
     };
 
     tracing::info!("Someone made a request to /version");
diff --git a/justfile b/justfile
index bb34ebd..b5d44be 100644
--- a/justfile
+++ b/justfile
@@ -1,18 +1,16 @@
 set shell := ["/usr/bin/env", "bash", "-euo", "pipefail", "-c"]
 
-export OTEL_SERVICE_NAME := "my-program"
-
 [private]
 default:
 	@just --choose
 
-# Run
-run $RUST_LOG="debug":
-  nix run
+# Run controller
+run-controller $RUST_LOG="debug":
+  cargo run --package patagia-controller
 
-# Run local development
-dev:
-  watchexec --clear --restart --stop-signal INT --debounce 300ms -- just run
+# Run controller local development
+dev-controller:
+  watchexec --clear --restart --stop-signal INT --debounce 300ms -- just run-controller
 
 # Run all tests
 check: