diff --git a/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/connectors/upload.py b/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/connectors/upload.py
index 020fc793713..98a2b89f07e 100644
--- a/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/connectors/upload.py
+++ b/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/connectors/upload.py
@@ -56,6 +56,7 @@
     "oracle",
     "redshift",
     "memsql",
+    "lakehouse",
 }
 
 CREATE_SCHEMA_QUERY_TEMPLATE = """
diff --git a/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/trino.py b/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/trino.py
index aa4cb2c8a60..62f94f54073 100644
--- a/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/trino.py
+++ b/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/trino.py
@@ -424,11 +424,16 @@ def pull_all_from_table_or_query(
         )
 
         timestamp_filter = get_timestamp_filter_sql(
-            start_date, end_date, timestamp_field, quote_fields=False
+            start_date,
+            end_date,
+            timestamp_field,
+            quote_fields=False,
+            cast_style="timestamp",
+            date_time_separator=" ",
         )
         query = f"""
             SELECT {field_string}
-            FROM {from_expression}
+            FROM ( {from_expression} )
             WHERE {timestamp_filter}
         """
         return TrinoRetrievalJob(