diff --git a/agents-api/agents_api/routers/tasks/create_task_execution.py b/agents-api/agents_api/routers/tasks/create_task_execution.py
index 393c9e6d1..c02ba1c7c 100644
--- a/agents-api/agents_api/routers/tasks/create_task_execution.py
+++ b/agents-api/agents_api/routers/tasks/create_task_execution.py
@@ -22,16 +22,15 @@
 from ...dependencies.developer_id import get_developer_id
 from ...env import max_free_executions
 
-# TODO: Change these once we have pg queries for executions
-from ...models.execution.count_executions import (
+from ...queries.executions.count_executions import (
     count_executions as count_executions_query,
 )
-from ...models.execution.create_execution import (
+from ...queries.executions.create_execution import (
     create_execution as create_execution_query,
 )
-from ...models.execution.create_temporal_lookup import create_temporal_lookup
-from ...models.execution.prepare_execution_input import prepare_execution_input
-from ...models.execution.update_execution import (
+from ...queries.executions.create_temporal_lookup import create_temporal_lookup
+from ...queries.executions.prepare_execution_input import prepare_execution_input
+from ...queries.executions.update_execution import (
     update_execution as update_execution_query,
 )
 from ...queries.developers.get_developer import get_developer
diff --git a/agents-api/agents_api/routers/tasks/get_execution_details.py b/agents-api/agents_api/routers/tasks/get_execution_details.py
index a2b219d53..ca0ced01e 100644
--- a/agents-api/agents_api/routers/tasks/get_execution_details.py
+++ b/agents-api/agents_api/routers/tasks/get_execution_details.py
@@ -4,8 +4,7 @@
     Execution,
 )
 
-# TODO: Change this once we have pg queries for executions
-from ...models.execution.get_execution import (
+from ...queries.executions.get_execution import (
     get_execution as get_execution_query,
 )
 from .router import router
diff --git a/agents-api/agents_api/routers/tasks/list_execution_transitions.py b/agents-api/agents_api/routers/tasks/list_execution_transitions.py
index 8d3fb586c..b8ea0dc90 100644
--- a/agents-api/agents_api/routers/tasks/list_execution_transitions.py
+++ b/agents-api/agents_api/routers/tasks/list_execution_transitions.py
@@ -6,8 +6,7 @@
     Transition,
 )
 
-# TODO: Change this once we have pg queries for executions
-from ...models.execution.list_execution_transitions import (
+from ...queries.executions.list_execution_transitions import (
     list_execution_transitions as list_execution_transitions_query,
 )
 from .router import router
diff --git a/agents-api/agents_api/routers/tasks/list_task_executions.py b/agents-api/agents_api/routers/tasks/list_task_executions.py
index aad2cf124..1cf3c882a 100644
--- a/agents-api/agents_api/routers/tasks/list_task_executions.py
+++ b/agents-api/agents_api/routers/tasks/list_task_executions.py
@@ -9,8 +9,7 @@
 )
 from ...dependencies.developer_id import get_developer_id
 
-# TODO: Change this once we have pg queries for executions
-from ...models.execution.list_executions import (
+from ...queries.executions.list_executions import (
     list_executions as list_task_executions_query,
 )
 from .router import router
diff --git a/agents-api/agents_api/routers/tasks/patch_execution.py b/agents-api/agents_api/routers/tasks/patch_execution.py
index 9fbb2f296..1f37b03da 100644
--- a/agents-api/agents_api/routers/tasks/patch_execution.py
+++ b/agents-api/agents_api/routers/tasks/patch_execution.py
@@ -9,8 +9,7 @@
 )
 from ...dependencies.developer_id import get_developer_id
 
-# TODO: Change this once we have pg queries for executions
-from ...models.execution.update_execution import (
+from ...queries.executions.update_execution import (
     update_execution as update_execution_query,
 )
 from .router import router
diff --git a/agents-api/agents_api/routers/tasks/stream_transitions_events.py b/agents-api/agents_api/routers/tasks/stream_transitions_events.py
index b3b469c9e..fd4cf0406 100644
--- a/agents-api/agents_api/routers/tasks/stream_transitions_events.py
+++ b/agents-api/agents_api/routers/tasks/stream_transitions_events.py
@@ -19,8 +19,7 @@
 from ...clients.temporal import get_workflow_handle
 from ...dependencies.developer_id import get_developer_id
 
-# TODO: Change this once we have pg queries for executions
-from ...models.execution.lookup_temporal_data import lookup_temporal_data
+from ...queries.executions.lookup_temporal_data import lookup_temporal_data
 from ...worker.codec import from_payload_data
 from .router import router
 
diff --git a/agents-api/agents_api/routers/tasks/update_execution.py b/agents-api/agents_api/routers/tasks/update_execution.py
index f58b65533..1b3712ea1 100644
--- a/agents-api/agents_api/routers/tasks/update_execution.py
+++ b/agents-api/agents_api/routers/tasks/update_execution.py
@@ -11,11 +11,10 @@
 from ...clients.temporal import get_client
 from ...dependencies.developer_id import get_developer_id
 
-# TODO: Change this once we have pg queries for executions
-from ...models.execution.get_paused_execution_token import (
+from ...queries.executions.get_paused_execution_token import (
     get_paused_execution_token,
 )
-from ...models.execution.get_temporal_workflow_data import (
+from ...queries.executions.get_temporal_workflow_data import (
     get_temporal_workflow_data,
 )
 from .router import router