diff --git a/ansible/freecad_mcp/.env.j2 b/ansible/freecad_mcp/.env.j2
index fd3f6bd..51bf2b2 100644
--- a/ansible/freecad_mcp/.env.j2
+++ b/ansible/freecad_mcp/.env.j2
@@ -4,18 +4,18 @@
 # =============================================================================
 # MCP Transport Configuration
 # =============================================================================
-FREECAD_TRANSPORT=http
-FREECAD_HTTP_PORT={{ freecad_mcp_port }}
+FREECAD_MCP_TRANSPORT=http
+FREECAD_MCP_HTTP_PORT={{ freecad_mcp_port }}
 
 # =============================================================================
 # FreeCAD Connection Mode
 # =============================================================================
-FREECAD_MODE={{ freecad_mcp_mode | default('xmlrpc') }}
-FREECAD_XMLRPC_HOST={{ freecad_mcp_xmlrpc_host | default('localhost') }}
-FREECAD_XMLRPC_PORT={{ freecad_mcp_xmlrpc_port | default('9875') }}
-FREECAD_TIMEOUT_MS={{ freecad_mcp_timeout_ms | default('30000') }}
+FREECAD_MCP_MODE={{ freecad_mcp_mode | default('xmlrpc') }}
+FREECAD_MCP_XMLRPC_HOST={{ freecad_mcp_xmlrpc_host | default('localhost') }}
+FREECAD_MCP_XMLRPC_PORT={{ freecad_mcp_xmlrpc_port | default('9875') }}
+FREECAD_MCP_TIMEOUT_MS={{ freecad_mcp_timeout_ms | default('30000') }}
 
 # =============================================================================
 # Logging
 # =============================================================================
-FREECAD_LOG_LEVEL={{ freecad_mcp_log_level | default('INFO') }}
+FREECAD_MCP_LOG_LEVEL={{ freecad_mcp_log_level | default('INFO') }}
diff --git a/ansible/inventory/group_vars/all/vars.yml b/ansible/inventory/group_vars/all/vars.yml
index fd99b7c..2486a23 100644
--- a/ansible/inventory/group_vars/all/vars.yml
+++ b/ansible/inventory/group_vars/all/vars.yml
@@ -26,16 +26,17 @@ agent_s_rel: main
 anythingllm_rel: master
 athena_rel: main
 athena_mcp_rel: main
-argos_rel: master
+argos_rel: main
 arke_rel: main
-angelia_rel: master
+angelia_rel: main
 kairos_rel: master
 kairos_mcp_rel: master
 spelunker_rel: master
-mcp_switchboard_rel: master
-kernos_rel: master
-rommie_rel: master
+mcp_switchboard_rel: main
+kernos_rel: main
+rommie_rel: main
 # PyPI release version (no 'v' prefix) - https://pypi.org/project/open-webui/
+freecad_mcp_version: 0.6.1
 openwebui_rel: 0.8.3
 pulseaudio_module_xrdp_rel: devel
 searxng_oauth2_proxy_version: 7.6.0
@@ -54,7 +55,7 @@ neo4j_mcp_url: http://circe.helu.ca:22034/mcp
 nike_mcp_url: http://puck.incus:22031/mcp
 korax_mcp_url: http://korax.helu.ca:22021/mcp
 rommie_mcp_url: http://caliban.incus:22031/mcp
-freecad_mcp_url: http://caliban.incus:22082/mcp
+freecad_mcp_url: http://caliban.incus:22032/mcp
 
 # Monitoring and Logging (internal endpoints on Prospero)
 loki_url: http://prospero.incus:3100/loki/api/v1/push
diff --git a/ansible/inventory/host_vars/caliban.incus.yml b/ansible/inventory/host_vars/caliban.incus.yml
index 8a95a65..8ea8914 100644
--- a/ansible/inventory/host_vars/caliban.incus.yml
+++ b/ansible/inventory/host_vars/caliban.incus.yml
@@ -36,8 +36,7 @@ rommie_grounding_height: 1024
 freecad_mcp_user: harper
 freecad_mcp_group: harper
 freecad_mcp_directory: /srv/freecad-mcp
-freecad_mcp_port: 22082
-freecad_mcp_version: "0.5.0"
+freecad_mcp_port: 22032
 
 # Kernos MCP Shell Server Configuration
 kernos_user: harper
diff --git a/ansible/inventory/hosts b/ansible/inventory/hosts
index 5508d28..34b67d2 100644
--- a/ansible/inventory/hosts
+++ b/ansible/inventory/hosts
@@ -48,3 +48,7 @@ gitea:
 mcpo:
   hosts:
     miranda.incus:
+
+rommie:
+  hosts:
+    caliban.incus:
diff --git a/ansible/rommie/deploy.yml b/ansible/rommie/deploy.yml
index 9763be8..750a5b4 100644
--- a/ansible/rommie/deploy.yml
+++ b/ansible/rommie/deploy.yml
@@ -3,7 +3,7 @@
   import_playbook: ../agent_s/deploy.yml
 
 - name: Deploy Rommie MCP Server
-  hosts: caliban
+  hosts: rommie
   become: yes
   vars:
     rommie_venv: "/home/{{principal_user}}/env/rommie"
@@ -29,6 +29,15 @@
       args:
         creates: "{{rommie_venv}}/bin/activate"
 
+    - name: Install gui-agents (ignore upstream Python version cap)
+      become_user: "{{principal_user}}"
+      command: >
+        {{rommie_venv}}/bin/pip install
+        --ignore-requires-python
+        "gui-agents>=0.3.1"
+      args:
+        creates: "{{rommie_venv}}/lib/python3.13/site-packages/gui_agents"
+
     - name: Install Rommie into virtual environment
       become_user: "{{principal_user}}"
       pip: