diff --git a/agents-api/agents_api/routers/tasks/create_or_update_task.py b/agents-api/agents_api/routers/tasks/create_or_update_task.py
index f40530dfc..7c93be8b0 100644
--- a/agents-api/agents_api/routers/tasks/create_or_update_task.py
+++ b/agents-api/agents_api/routers/tasks/create_or_update_task.py
@@ -11,7 +11,7 @@
     ResourceUpdatedResponse,
 )
 from ...dependencies.developer_id import get_developer_id
-from ...models.task.create_or_update_task import (
+from ...queries.tasks.create_or_update_task import (
     create_or_update_task as create_or_update_task_query,
 )
 from .router import router
diff --git a/agents-api/agents_api/routers/tasks/create_task.py b/agents-api/agents_api/routers/tasks/create_task.py
index 0e233ac97..0dc4e91e4 100644
--- a/agents-api/agents_api/routers/tasks/create_task.py
+++ b/agents-api/agents_api/routers/tasks/create_task.py
@@ -11,7 +11,7 @@
     ResourceCreatedResponse,
 )
 from ...dependencies.developer_id import get_developer_id
-from ...models.task.create_task import create_task as create_task_query
+from ...queries.tasks.create_task import create_task as create_task_query
 from .router import router
 
 
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 bb1497b4c..7fc5c9a79 100644
--- a/agents-api/agents_api/routers/tasks/create_task_execution.py
+++ b/agents-api/agents_api/routers/tasks/create_task_execution.py
@@ -21,7 +21,8 @@
 from ...common.protocol.developers import Developer
 from ...dependencies.developer_id import get_developer_id
 from ...env import max_free_executions
-from ...models.developer.get_developer import get_developer
+from ...queries.developers.get_developer import get_developer
+# TODO: Change these once we have pg queries for executions
 from ...models.execution.count_executions import (
     count_executions as count_executions_query,
 )
@@ -33,7 +34,7 @@
 from ...models.execution.update_execution import (
     update_execution as update_execution_query,
 )
-from ...models.task.get_task import get_task as get_task_query
+from ...queries.tasks.get_task import get_task as get_task_query
 from .router import router
 
 logger: logging.Logger = logging.getLogger(__name__)
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 95bccbc07..87c4e24b9 100644
--- a/agents-api/agents_api/routers/tasks/get_execution_details.py
+++ b/agents-api/agents_api/routers/tasks/get_execution_details.py
@@ -3,6 +3,7 @@
 from ...autogen.openapi_model import (
     Execution,
 )
+# TODO: Change this once we have pg queries for executions
 from ...models.execution.get_execution import (
     get_execution as get_execution_query,
 )
diff --git a/agents-api/agents_api/routers/tasks/get_task_details.py b/agents-api/agents_api/routers/tasks/get_task_details.py
index 9f8008118..35a7ef747 100644
--- a/agents-api/agents_api/routers/tasks/get_task_details.py
+++ b/agents-api/agents_api/routers/tasks/get_task_details.py
@@ -8,7 +8,7 @@
     Task,
 )
 from ...dependencies.developer_id import get_developer_id
-from ...models.task.get_task import get_task as get_task_query
+from ...queries.tasks.get_task import get_task as get_task_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 9ce169509..7a394c103 100644
--- a/agents-api/agents_api/routers/tasks/list_execution_transitions.py
+++ b/agents-api/agents_api/routers/tasks/list_execution_transitions.py
@@ -5,6 +5,7 @@
     ListResponse,
     Transition,
 )
+# TODO: Change this once we have pg queries for executions
 from ...models.execution.list_execution_transitions import (
     list_execution_transitions as list_execution_transitions_query,
 )
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 72cbd9b40..abe54a0a8 100644
--- a/agents-api/agents_api/routers/tasks/list_task_executions.py
+++ b/agents-api/agents_api/routers/tasks/list_task_executions.py
@@ -8,6 +8,7 @@
     ListResponse,
 )
 from ...dependencies.developer_id import get_developer_id
+# TODO: Change this once we have pg queries for executions
 from ...models.execution.list_executions import (
     list_executions as list_task_executions_query,
 )
diff --git a/agents-api/agents_api/routers/tasks/list_tasks.py b/agents-api/agents_api/routers/tasks/list_tasks.py
index a53983006..2422cdef3 100644
--- a/agents-api/agents_api/routers/tasks/list_tasks.py
+++ b/agents-api/agents_api/routers/tasks/list_tasks.py
@@ -8,7 +8,7 @@
     Task,
 )
 from ...dependencies.developer_id import get_developer_id
-from ...models.task.list_tasks import list_tasks as list_tasks_query
+from ...queries.tasks.list_tasks import list_tasks as list_tasks_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 3cc45ee37..b9a8ddcec 100644
--- a/agents-api/agents_api/routers/tasks/patch_execution.py
+++ b/agents-api/agents_api/routers/tasks/patch_execution.py
@@ -8,6 +8,7 @@
     UpdateExecutionRequest,
 )
 from ...dependencies.developer_id import get_developer_id
+# TODO: Change this once we have pg queries for executions
 from ...models.execution.update_execution import (
     update_execution as update_execution_query,
 )
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 37500b0d6..cebc345c9 100644
--- a/agents-api/agents_api/routers/tasks/stream_transitions_events.py
+++ b/agents-api/agents_api/routers/tasks/stream_transitions_events.py
@@ -18,6 +18,7 @@
 from ...autogen.openapi_model import TransitionEvent
 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 ...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 e88c36ed9..08f802f51 100644
--- a/agents-api/agents_api/routers/tasks/update_execution.py
+++ b/agents-api/agents_api/routers/tasks/update_execution.py
@@ -10,6 +10,7 @@
 )
 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 (
     get_paused_execution_token,
 )
diff --git a/monitoring/grafana/provisioning/dashboards/main.yaml b/monitoring/grafana/provisioning/dashboards/main.yaml
new file mode 100755
index 000000000..e69de29bb