diff --git a/flake.lock b/flake.lock
new file mode 100644
index 00000000..56bca1f8
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1789370336,
+        "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c7def046b9a883d46974757852106483d741586f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 00000000..107ac383
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,28 @@
+{
+  description = "Development environment for adf-core-python";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
+  outputs = { nixpkgs, ... }:
+    let
+      system = "aarch64-darwin";
+      pkgs = import nixpkgs { inherit system; };
+      nativeLibraries = with pkgs; [
+        geos
+        libspatialindex
+      ];
+    in
+    {
+      devShells.${system}.default = pkgs.mkShell {
+        packages = with pkgs; [
+          python313
+          uv
+          pkg-config
+        ] ++ nativeLibraries;
+
+        UV_PYTHON = "${pkgs.python313}/bin/python3.13";
+        UV_PYTHON_DOWNLOADS = "never";
+        DYLD_LIBRARY_PATH = pkgs.lib.makeLibraryPath nativeLibraries;
+      };
+    };
+}
diff --git a/src/adf_core_python/implement/tactics/default_tactics_fire_brigade.py b/src/adf_core_python/implement/tactics/default_tactics_fire_brigade.py
index 5b9b8dbb..617f8e66 100644
--- a/src/adf_core_python/implement/tactics/default_tactics_fire_brigade.py
+++ b/src/adf_core_python/implement/tactics/default_tactics_fire_brigade.py
@@ -68,7 +68,7 @@ def initialize(
       "adf_core_python.implement.action.default_extend_action_rescue.DefaultExtendActionRescue",
     )
     self._action_ext_move = module_manager.get_extend_action(
-      "DefaultTacticsAmbulanceTeam.ExtendActionMove",
+      "DefaultTacticsFireBrigade.ExtendActionMove",
       "adf_core_python.implement.action.default_extend_action_move.DefaultExtendActionMove",
     )
     self._command_executor_fire = module_manager.get_command_executor(
@@ -76,7 +76,7 @@ def initialize(
       "adf_core_python.implement.centralized.default_command_executor_fire.DefaultCommandExecutorFire",
     )
     self._command_executor_scout = module_manager.get_command_executor(
-      "DefaultTacticsAmbulanceTeam.CommandExecutorScout",
+      "DefaultTacticsFireBrigade.CommandExecutorScout",
       "adf_core_python.implement.centralized.default_command_executor_scout.DefaultCommandExecutorScout",
     )