diff --git a/.tool-versions b/.tool-versions
index 6a8ff7e4e6..1d9dafe965 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,5 +1,5 @@
-elixir 1.19.5-otp-27
-erlang 27.3.4.6
+elixir 1.20.2-otp-27
+erlang 27.3.4.13
 nodejs 22.9.0
 protoc 28.0
 rust 1.94.1
diff --git a/Dockerfile b/Dockerfile
index 751bbb85fe..509ee4f258 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG ELIXIR_VERSION=1.19.5
-ARG OTP_VERSION=27.3.4.6
-ARG DEBIAN_VERSION=trixie-20260112-slim
+ARG ELIXIR_VERSION=1.20.2
+ARG OTP_VERSION=27.3.4.13
+ARG DEBIAN_VERSION=trixie-20260623-slim
 
 ARG RUST_VERSION=1.94.1
 ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
diff --git a/Dockerfile.base b/Dockerfile.base
index 6b386232ca..f3b68c82ee 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,6 +1,6 @@
-ARG ELIXIR_VERSION=1.19.5
-ARG OTP_VERSION=27.3.4.6
-ARG DEBIAN_VERSION=trixie-20260112-slim
+ARG ELIXIR_VERSION=1.20.2
+ARG OTP_VERSION=27.3.4.13
+ARG DEBIAN_VERSION=trixie-20260623-slim
 
 ARG RUST_VERSION=1.94.1
 ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
diff --git a/lib/logflare/backends/adaptor/clickhouse_adaptor/ingester.ex b/lib/logflare/backends/adaptor/clickhouse_adaptor/ingester.ex
index b81eac35ab..c9606ea006 100644
--- a/lib/logflare/backends/adaptor/clickhouse_adaptor/ingester.ex
+++ b/lib/logflare/backends/adaptor/clickhouse_adaptor/ingester.ex
@@ -315,10 +315,6 @@ defmodule Logflare.Backends.Adaptor.ClickHouseAdaptor.Ingester do
      ]}
   end
 
-  defp build_connection_opts(_backend) do
-    {:error, "Unable to build connection options"}
-  end
-
   @spec build_request_url(
           connection_opts :: Keyword.t(),
           table :: String.t(),
diff --git a/lib/logflare/backends/adaptor/otlp_adaptor/protobuf_formatter.ex b/lib/logflare/backends/adaptor/otlp_adaptor/protobuf_formatter.ex
index ed4e9bfa81..b7d2e36dad 100644
--- a/lib/logflare/backends/adaptor/otlp_adaptor/protobuf_formatter.ex
+++ b/lib/logflare/backends/adaptor/otlp_adaptor/protobuf_formatter.ex
@@ -116,14 +116,14 @@ defmodule Logflare.Backends.Adaptor.OtlpAdaptor.ProtobufFormatter do
   defp build_log_record_fields({"span_id", id}) when is_binary(id), do: [span_id: id]
   defp build_log_record_fields(_unmatched), do: []
 
+  # TODO: distinguish from string
   defp make_value(v) when is_binary(v), do: %AnyValue{value: {:string_value, v}}
+  # defp make_value(v) when is_binary(v), do: %AnyValue{value: {:bytes_value, v}}
   defp make_value(v) when is_boolean(v), do: %AnyValue{value: {:bool_value, v}}
   defp make_value(v) when is_integer(v), do: %AnyValue{value: {:int_value, v}}
   defp make_value(v) when is_float(v), do: %AnyValue{value: {:double_value, v}}
   defp make_value(v) when is_list(v), do: %AnyValue{value: {:array_value, make_array(v)}}
   defp make_value(v) when is_map(v), do: %AnyValue{value: {:kvlist_value, make_key_value_list(v)}}
-  # TODO: distinguish from string
-  defp make_value(v) when is_binary(v), do: %AnyValue{value: {:bytes_value, v}}
 
   defp make_key_value({k, v}), do: %KeyValue{key: to_string(k), value: make_value(v)}
 
diff --git a/lib/logflare/backends/adaptor/postgres_adaptor.ex b/lib/logflare/backends/adaptor/postgres_adaptor.ex
index b3a9634db8..1c7b81626e 100644
--- a/lib/logflare/backends/adaptor/postgres_adaptor.ex
+++ b/lib/logflare/backends/adaptor/postgres_adaptor.ex
@@ -320,7 +320,7 @@ defmodule Logflare.Backends.Adaptor.PostgresAdaptor do
     state = %__MODULE__{
       config: backend.config,
       backend: backend,
-      backend_token: if(backend, do: backend.token, else: nil),
+      backend_token: backend.token,
       source_token: source.token,
       source: source,
       pipeline_name: Backends.via_source(source, Pipeline, backend.id)
diff --git a/lib/logflare/backends/ingest_event_queue/queue_janitor.ex b/lib/logflare/backends/ingest_event_queue/queue_janitor.ex
index ea4f945047..a6fc4c9c29 100644
--- a/lib/logflare/backends/ingest_event_queue/queue_janitor.ex
+++ b/lib/logflare/backends/ingest_event_queue/queue_janitor.ex
@@ -193,19 +193,22 @@ defmodule Logflare.Backends.IngestEventQueue.QueueJanitor do
   defp process_stale_events(_table_key, []), do: {0, 0}
 
   defp process_stale_events(table_key, stale_ids) do
-    with tid when tid != nil <- IngestEventQueue.get_tid(table_key) do
-      Enum.reduce(stale_ids, {0, 0}, fn id, {resets, drops} ->
-        case act_on_stale_event(tid, id) do
-          :reset -> {resets + 1, drops}
-          :drop -> {resets, drops + 1}
-          :skip -> {resets, drops}
-        end
-      end)
-    else
-      _ -> {0, 0}
+    case IngestEventQueue.get_tid(table_key) do
+      nil -> {0, 0}
+      tid -> tally_stale_events(tid, stale_ids)
     end
   end
 
+  defp tally_stale_events(tid, stale_ids) do
+    Enum.reduce(stale_ids, {0, 0}, fn id, {resets, drops} ->
+      case act_on_stale_event(tid, id) do
+        :reset -> {resets + 1, drops}
+        :drop -> {resets, drops + 1}
+        :skip -> {resets, drops}
+      end
+    end)
+  end
+
   # Pass the exact row observed by the lookup to IngestEventQueue's CAS helpers, so an event
   # acked, deleted, or re-claimed between lookup and write is neither dropped nor reset (a
   # re-claimed row carries a newer claimed_at and will not match). The :reset/:drop/:skip
diff --git a/lib/logflare/endpoints.ex b/lib/logflare/endpoints.ex
index f8da98ea9b..2ad60bbc4b 100644
--- a/lib/logflare/endpoints.ex
+++ b/lib/logflare/endpoints.ex
@@ -286,17 +286,20 @@ defmodule Logflare.Endpoints do
   @spec maybe_kill_endpoint_caches(EndpointQuery.t(), map()) :: :ok
   defp maybe_kill_endpoint_caches(endpoint, changes) do
     if should_kill_caches?(changes) do
-      for pid <- Resolver.list_caches(endpoint) do
-        Utils.Tasks.async(fn ->
-          ResultsCache.invalidate(pid)
-        end)
-      end
+      endpoint
+      |> Resolver.list_caches()
+      |> Enum.map(&invalidate_cache_async/1)
       |> Task.await_many(30_000)
     end
 
     :ok
   end
 
+  @spec invalidate_cache_async(pid()) :: Task.t()
+  defp invalidate_cache_async(pid) do
+    Utils.Tasks.async(fn -> ResultsCache.invalidate(pid) end)
+  end
+
   @spec get_endpoint_query_version(integer(), integer()) :: Version.t() | nil
   def get_endpoint_query_version(endpoint_id, version_number)
       when is_integer(endpoint_id) and is_integer(version_number) do
diff --git a/lib/logflare/google/bigquery/bigquery.ex b/lib/logflare/google/bigquery/bigquery.ex
index 388f5af8d7..0306581c5d 100644
--- a/lib/logflare/google/bigquery/bigquery.ex
+++ b/lib/logflare/google/bigquery/bigquery.ex
@@ -67,15 +67,11 @@ defmodule Logflare.Google.BigQuery do
     conn = GenUtils.get_conn()
     table_name = GenUtils.format_table_name(source_id)
 
-    %{user_id: user_id, bigquery_project_id: project_id, bigquery_dataset_id: dataset_id} =
+    %{user_id: _user_id, bigquery_project_id: project_id, bigquery_dataset_id: dataset_id} =
       GenUtils.get_bq_user_info(source_id)
 
     conn
-    |> Api.Tables.bigquery_tables_delete(
-      project_id,
-      dataset_id || Integer.to_string(user_id) <> GCPConfig.dataset_id_append(),
-      table_name
-    )
+    |> Api.Tables.bigquery_tables_delete(project_id, dataset_id, table_name)
     |> GenUtils.maybe_parse_google_api_result()
   end
 
@@ -186,14 +182,8 @@ defmodule Logflare.Google.BigQuery do
       bigquery_dataset_id: dataset_id
     } = GenUtils.get_bq_user_info(source_id)
 
-    dataset_id = dataset_id || GenUtils.get_account_id(source_id) <> GCPConfig.dataset_id_append()
-
     conn
-    |> Api.Tables.bigquery_tables_get(
-      project_id,
-      dataset_id,
-      table_name
-    )
+    |> Api.Tables.bigquery_tables_get(project_id, dataset_id, table_name)
     |> GenUtils.maybe_parse_google_api_result()
   end
 
@@ -307,14 +297,14 @@ defmodule Logflare.Google.BigQuery do
     emails =
       for x <- [user | team_users], x.provider == "google", do: x.email
 
-    if Enum.count(user.sources) > 0 do
+    if Enum.empty?(user.sources) do
+      {:ok, :nothing_patched}
+    else
       Tasks.start_child(fn ->
         patch(dataset_id, emails, project_id, user.id)
       end)
 
       {:ok, :patch_attempted}
-    else
-      {:ok, :nothing_patched}
     end
   end
 
diff --git a/lib/logflare/logs/rejected_log_events.ex b/lib/logflare/logs/rejected_log_events.ex
index 484036227d..4e590b0f9f 100644
--- a/lib/logflare/logs/rejected_log_events.ex
+++ b/lib/logflare/logs/rejected_log_events.ex
@@ -53,11 +53,9 @@ defmodule Logflare.Logs.RejectedLogEvents do
 
   @spec get_by_source(Source.t()) :: list(LE.t())
   def get_by_source(%Source{token: token}) do
-    get!(token)
-    |> case do
-      %{log_events: events} -> events
-      other -> other
-    end
+    token
+    |> get!()
+    |> Map.fetch!(:log_events)
   end
 
   def count(%Source{} = s) do
diff --git a/lib/logflare/lql/backend_transformer/bigquery.ex b/lib/logflare/lql/backend_transformer/bigquery.ex
index 3813806b09..3544cb8fb4 100644
--- a/lib/logflare/lql/backend_transformer/bigquery.ex
+++ b/lib/logflare/lql/backend_transformer/bigquery.ex
@@ -65,7 +65,6 @@ defmodule Logflare.Lql.BackendTransformer.BigQuery do
       end
 
     case normalized_rules do
-      [] -> query
       [%{wildcard: true}] -> query
       rules -> build_combined_select(query, rules)
     end
diff --git a/lib/logflare/lql/backend_transformer/clickhouse.ex b/lib/logflare/lql/backend_transformer/clickhouse.ex
index be9b24414d..38ab731ff4 100644
--- a/lib/logflare/lql/backend_transformer/clickhouse.ex
+++ b/lib/logflare/lql/backend_transformer/clickhouse.ex
@@ -66,7 +66,6 @@ defmodule Logflare.Lql.BackendTransformer.ClickHouse do
       end
 
     case normalized_rules do
-      [] -> query
       [%{wildcard: true}] -> query
       rules -> build_combined_select(query, rules)
     end
diff --git a/lib/logflare/lql/backend_transformer/postgres.ex b/lib/logflare/lql/backend_transformer/postgres.ex
index 6645225863..2467a20c65 100644
--- a/lib/logflare/lql/backend_transformer/postgres.ex
+++ b/lib/logflare/lql/backend_transformer/postgres.ex
@@ -687,7 +687,7 @@ defmodule Logflare.Lql.BackendTransformer.Postgres do
   end
 
   @spec build_jsonb_accessor([String.t()]) :: String.t()
-  defp build_jsonb_accessor(path) when is_list(path) and length(path) > 0 do
+  defp build_jsonb_accessor(path) when is_non_empty_list(path) do
     # For ["metadata", "status"]: body->'metadata'->>'status'
     # For ["metadata", "user", "email"]: body->'metadata'->'user'->>'email'
     {last, rest} = List.pop_at(path, -1)
diff --git a/lib/logflare/sources/source/bigquery/pipeline.ex b/lib/logflare/sources/source/bigquery/pipeline.ex
index fcc0347d2d..920c44c200 100644
--- a/lib/logflare/sources/source/bigquery/pipeline.ex
+++ b/lib/logflare/sources/source/bigquery/pipeline.ex
@@ -85,7 +85,7 @@ defmodule Logflare.Sources.Source.BigQuery.Pipeline do
             source_token: source.token,
             bq_storage_write_api: source.bq_storage_write_api,
             source_id: source.id,
-            backend_id: Map.get(backend || %{}, :id),
+            backend_id: Map.get(backend, :id),
             user_id: source.user_id,
             system_source: source.system_source
           }
@@ -138,14 +138,7 @@ defmodule Logflare.Sources.Source.BigQuery.Pipeline do
 
       source ->
         metrics = Sources.get_source_metrics_for_ingest(source.token)
-
-        for %{data: {id, tid, _size}} <- successful do
-          if metrics.avg > 100 do
-            IngestEventQueue.delete_id(tid, id)
-          else
-            IngestEventQueue.update_status(tid, id, :ingested)
-          end
-        end
+        finalize_acked_events(successful, metrics)
     end
 
     :telemetry.execute(
@@ -157,6 +150,23 @@ defmodule Logflare.Sources.Source.BigQuery.Pipeline do
     :ok
   end
 
+  # avg ingest rate above threshold: drop from the queue rather than mark :ingested
+  # to shed load; below threshold: keep the event and finalize its status.
+  @spec finalize_acked_events([Message.t()], map()) :: :ok
+  defp finalize_acked_events(successful, %{avg: avg}) when avg > 100 do
+    for %{data: {id, tid, _size}} <- successful,
+        do: IngestEventQueue.delete_id(tid, id)
+
+    :ok
+  end
+
+  defp finalize_acked_events(successful, _metrics) do
+    for %{data: {id, tid, _size}} <- successful,
+        do: IngestEventQueue.update_status(tid, id, :ingested)
+
+    :ok
+  end
+
   @impl Broadway
   def handle_message(_processor_name, message, context) do
     Logger.metadata(
diff --git a/lib/logflare/sources/source/slack_hook_server/slack_hook_server.ex b/lib/logflare/sources/source/slack_hook_server/slack_hook_server.ex
index 1bca490f66..ac47d0428c 100644
--- a/lib/logflare/sources/source/slack_hook_server/slack_hook_server.ex
+++ b/lib/logflare/sources/source/slack_hook_server/slack_hook_server.ex
@@ -50,7 +50,7 @@ defmodule Logflare.Sources.Source.SlackHookServer do
            true <- new_count > 0,
            true <- source.slack_hook_url != nil,
            events when is_list(events) <- fetch_events(source, new_count),
-           true <- Enum.count(events) > 0 do
+           true <- not Enum.empty?(events) do
         SlackAdaptor.send_message(source, events, new_count)
         |> handle_response(source)
 
diff --git a/lib/logflare/sources/source/supervisor.ex b/lib/logflare/sources/source/supervisor.ex
index fb1c6f50b8..3a33875751 100644
--- a/lib/logflare/sources/source/supervisor.ex
+++ b/lib/logflare/sources/source/supervisor.ex
@@ -40,11 +40,6 @@ defmodule Logflare.Sources.Source.Supervisor do
       {:error, :already_started} ->
         :noop
 
-      {:error, _} = err ->
-        Logger.error(
-          "Source.Supervisor -  Failed to start SourceSup: #{source_token}, #{inspect(err)}"
-        )
-
       _ ->
         :noop
     end
@@ -79,13 +74,6 @@ defmodule Logflare.Sources.Source.Supervisor do
 
       {:error, :already_started} ->
         :noop
-
-      {:error, _reason} = err ->
-        Logger.error(
-          "Failed to start SourceSup when attempting restart: #{source_token} , #{inspect(err)} "
-        )
-
-        :noop
     end
 
     {:noreply, state}
diff --git a/lib/logflare/sql/dialect_translation.ex b/lib/logflare/sql/dialect_translation.ex
index 9fbe3ddb3b..4ff7a5eafb 100644
--- a/lib/logflare/sql/dialect_translation.ex
+++ b/lib/logflare/sql/dialect_translation.ex
@@ -80,10 +80,8 @@ defmodule Logflare.Sql.DialectTranslation do
   @spec do_parameter_positions_mapping(query :: String.t(), params :: [String.t()]) :: %{
           pos_integer() => String.t()
         }
-  defp do_parameter_positions_mapping(_query, []), do: %{}
-
   defp do_parameter_positions_mapping(query, params)
-       when is_non_empty_binary(query) and is_list(params) do
+       when is_non_empty_binary(query) and is_non_empty_list(params) do
     str =
       params
       |> Enum.uniq()
diff --git a/lib/logflare/utils/guards.ex b/lib/logflare/utils/guards.ex
index 82f0ae4c31..d4ffd838f5 100644
--- a/lib/logflare/utils/guards.ex
+++ b/lib/logflare/utils/guards.ex
@@ -25,6 +25,11 @@ defmodule Logflare.Utils.Guards do
   """
   defguard is_non_empty_binary(value) when is_binary(value) and value != ""
 
+  @doc """
+  Guard that indicates if the value provided is a list with at least one element.
+  """
+  defguard is_non_empty_list(value) when is_list(value) and value != []
+
   @doc """
   Guard that indicates if the value provided is a map with at least one key.
   """
diff --git a/lib/logflare_web/controllers/api/endpoint_controller.ex b/lib/logflare_web/controllers/api/endpoint_controller.ex
index 7ebafdda2f..8c6d04cde4 100644
--- a/lib/logflare_web/controllers/api/endpoint_controller.ex
+++ b/lib/logflare_web/controllers/api/endpoint_controller.ex
@@ -63,7 +63,6 @@ defmodule LogflareWeb.Api.EndpointController do
       |> put_status(201)
       |> json(query)
     else
-      nil -> {:error, :not_found}
       err -> err
     end
   end
diff --git a/lib/logflare_web/controllers/billing_controller.ex b/lib/logflare_web/controllers/billing_controller.ex
index 2941e6f9fb..5561ac8ed0 100644
--- a/lib/logflare_web/controllers/billing_controller.ex
+++ b/lib/logflare_web/controllers/billing_controller.ex
@@ -342,7 +342,7 @@ defmodule LogflareWeb.BillingController do
 
   defp billing_account_has_subscription?(billing_account) do
     if subscriptions = billing_account.stripe_subscriptions["data"] do
-      Enum.count(subscriptions) > 0
+      not Enum.empty?(subscriptions)
     else
       false
     end
diff --git a/lib/logflare_web/live/alerts/alerts_live.ex b/lib/logflare_web/live/alerts/alerts_live.ex
index 74aa8c1261..2f0c0dc6a2 100644
--- a/lib/logflare_web/live/alerts/alerts_live.ex
+++ b/lib/logflare_web/live/alerts/alerts_live.ex
@@ -1,8 +1,6 @@
 defmodule LogflareWeb.AlertsLive do
   @moduledoc false
-
   use LogflareWeb, :live_view
-  use Phoenix.Component
 
   import Ecto.Query
   import LogflareWeb.Utils, only: [stringify_changeset_errors: 2, time_ago: 1]
diff --git a/lib/logflare_web/live/backends/actions/show.html.heex b/lib/logflare_web/live/backends/actions/show.html.heex
index dbb9796ecd..223bc5543a 100644
--- a/lib/logflare_web/live/backends/actions/show.html.heex
+++ b/lib/logflare_web/live/backends/actions/show.html.heex
@@ -22,7 +22,7 @@
       </li>
       <li :if={@backend.metadata} class="list-group-item tw-flex-col tw-gap-2 ">
         <strong>metadata:</strong>
-        <span :for={{k, v} when is_binary(v) <- @backend.metadata || %{}} :if={@backend.metadata} class="tw-block tw-ml-4">{k}: {v}</span>
+        <span :for={{k, v} when is_binary(v) <- @backend.metadata} :if={@backend.metadata} class="tw-block tw-ml-4">{k}: {v}</span>
       </li>
     </ul>
   </div>
diff --git a/lib/logflare_web/live/endpoints/endpoints_live.ex b/lib/logflare_web/live/endpoints/endpoints_live.ex
index 8f3c7ee73e..7758569bbf 100644
--- a/lib/logflare_web/live/endpoints/endpoints_live.ex
+++ b/lib/logflare_web/live/endpoints/endpoints_live.ex
@@ -1,8 +1,6 @@
 defmodule LogflareWeb.EndpointsLive do
   @moduledoc false
-
   use LogflareWeb, :live_view
-  use Phoenix.Component
 
   import Ecto.Query, only: [from: 2]
 
diff --git a/lib/logflare_web/live/endpoints/endpoints_versions_live.ex b/lib/logflare_web/live/endpoints/endpoints_versions_live.ex
index b0635e1c1e..1d64cae706 100644
--- a/lib/logflare_web/live/endpoints/endpoints_versions_live.ex
+++ b/lib/logflare_web/live/endpoints/endpoints_versions_live.ex
@@ -1,7 +1,6 @@
 defmodule LogflareWeb.EndpointsVersionsLive do
   @moduledoc false
   use LogflareWeb, :live_view
-  use Phoenix.Component
 
   import Ecto.Query
   import LogflareWeb.Utils, only: [time_ago: 1]
diff --git a/lib/logflare_web/live/query_live.ex b/lib/logflare_web/live/query_live.ex
index 441f31fb62..07efb50d41 100644
--- a/lib/logflare_web/live/query_live.ex
+++ b/lib/logflare_web/live/query_live.ex
@@ -1,8 +1,6 @@
 defmodule LogflareWeb.QueryLive do
   @moduledoc false
-
   use LogflareWeb, :live_view
-  use Phoenix.Component
 
   alias Logflare.Alerting
   alias Logflare.Backends
@@ -220,8 +218,7 @@ defmodule LogflareWeb.QueryLive do
 
     next_backend_id = backend_id_from_form(socket)
 
-    if query_string != nil and
-         (query_string != prev_query_string or next_backend_id != prev_backend_id) do
+    if query_string != prev_query_string or next_backend_id != prev_backend_id do
       send(self(), :parse_query)
     end
 
diff --git a/lib/logflare_web/live/search_live/subhead_components.ex b/lib/logflare_web/live/search_live/subhead_components.ex
index 1d68bc95a7..09aab22e7f 100644
--- a/lib/logflare_web/live/search_live/subhead_components.ex
+++ b/lib/logflare_web/live/search_live/subhead_components.ex
@@ -8,6 +8,7 @@ defmodule LogflareWeb.SearchLive.SubheadComponents do
 
   import LogflareWeb.LqlHelpers
   import LogflareWeb.ModalLiveHelpers, only: [modal_link: 1]
+  import Logflare.Utils.Guards
   alias Logflare.DateTimeUtils
   alias Phoenix.LiveView.JS
 
@@ -114,7 +115,7 @@ defmodule LogflareWeb.SearchLive.SubheadComponents do
     search_timezone != user_timezone(preferences)
   end
 
-  defp disabled_if_no_events(%{rows: rows}) when is_list(rows) and rows != [], do: nil
+  defp disabled_if_no_events(%{rows: rows}) when is_non_empty_list(rows), do: nil
   defp disabled_if_no_events(_), do: "tw-opacity-50 tw-pointer-events-none"
 
   defp user_timezone(preferences), do: preferences && Map.get(preferences, :timezone)
diff --git a/mix.lock b/mix.lock
index c044c8b510..3fa9d79e05 100644
--- a/mix.lock
+++ b/mix.lock
@@ -24,7 +24,7 @@
   "cowboy": {:hex, :cowboy, "2.15.0", "9cfe86ed7117bf045e10adbedb0170af7be57f2a3637e7be143433d8dd267396", [:make, :rebar3], [{:cowlib, ">= 2.16.0 and < 3.0.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, ">= 1.8.0 and < 3.0.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "179fb65140fb440a17b767ad53b755081506f9596c4db5c49c0396d8c8643668"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
   "cowlib": {:hex, :cowlib, "2.16.1", "318d385d55f657e9a5005838c4e426e13dcd724a691438384b6165a69687e531", [:make, :rebar3], [], "hexpm", "58f1e425a9e04176f1d30e20116f57c4e90ef0e187552e9741c465bdf4044f70"},
-  "credo": {:hex, :credo, "1.7.12", "9e3c20463de4b5f3f23721527fcaf16722ec815e70ff6c60b86412c695d426c1", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8493d45c656c5427d9c729235b99d498bd133421f3e0a683e5c1b561471291e5"},
+  "credo": {:hex, :credo, "1.7.19", "cc52129665fc7c15143d47838fda0f9cd6dac9ceced7bf4da6f85fcbfe64b12a", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "2d8bc95d5a7bb99dd2613621d4f08c6a3575c3fd4b62e6a2b48a100352a557b8"},
   "crontab": {:hex, :crontab, "1.2.0", "503611820257939d5d0fd272eb2b454f48a470435a809479ddc2c40bb515495c", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "ebd7ef4d831e1b20fa4700f0de0284a04cac4347e813337978e25b4cc5cc2207"},
   "ctx": {:hex, :ctx, "0.6.0", "8ff88b70e6400c4df90142e7f130625b82086077a45364a78d208ed3ed53c7fe", [:rebar3], [], "hexpm", "a14ed2d1b67723dbebbe423b28d7615eb0bdcba6ff28f2d1f1b0a7e1d4aa5fc2"},
   "db_connection": {:hex, :db_connection, "2.9.0", "a6a97c5c958a2d7091a58a9be40caf41ab496b0701d21e1d1abff3fa27a7f371", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "17d502eacaf61829db98facf6f20808ed33da6ccf495354a41e64fe42f9c509c"},
diff --git a/test/logflare/opentelemetry_test.exs b/test/logflare/opentelemetry_test.exs
index a917089a87..20ddac948d 100644
--- a/test/logflare/opentelemetry_test.exs
+++ b/test/logflare/opentelemetry_test.exs
@@ -6,6 +6,8 @@ defmodule Logflare.OpenTelemetryTest do
 
   use ExUnitProperties
 
+  import Logflare.Utils.Guards
+
   alias Broadway.Message
   alias Logflare.Backends.IngestEventQueue
   alias Logflare.Sources.Source.BigQuery.Pipeline
@@ -51,7 +53,7 @@ defmodule Logflare.OpenTelemetryTest do
       Pipeline.handle_batch(:bq, messages, batch_info, context)
 
       spans = collect_spans()
-      assert length(spans) > 0
+      assert is_non_empty_list(spans)
 
       for span <- spans do
         assert span(name: "ingest." <> _) = span
@@ -89,7 +91,7 @@ defmodule Logflare.OpenTelemetryTest do
       Pipeline.handle_batch(:bq, messages, batch_info, context)
 
       spans = collect_spans()
-      assert length(spans) > 0
+      assert is_non_empty_list(spans)
 
       for span <- spans do
         assert span(name: "ingest." <> _) = span
diff --git a/test/logflare/rules_test.exs b/test/logflare/rules_test.exs
index e81a3e63eb..b30d89a3f4 100644
--- a/test/logflare/rules_test.exs
+++ b/test/logflare/rules_test.exs
@@ -104,7 +104,7 @@ defmodule Logflare.RulesTest do
       assert rule.source_id == source.id
       assert rule.token != nil
       assert is_list(rule.lql_filters)
-      assert length(rule.lql_filters) >= 1
+      assert [_ | _rest] = rule.lql_filters
     end
 
     test "creates a rule with backend_id when provided" do
diff --git a/test/logflare/single_tenant_test.exs b/test/logflare/single_tenant_test.exs
index 8a3181b2eb..1605762789 100644
--- a/test/logflare/single_tenant_test.exs
+++ b/test/logflare/single_tenant_test.exs
@@ -1,6 +1,7 @@
 defmodule Logflare.SingleTenantTest do
   @moduledoc false
   use Logflare.DataCase
+  import Logflare.Utils.Guards
   alias Logflare.SingleTenant
   alias Logflare.Billing
   alias Logflare.Users
@@ -166,8 +167,8 @@ defmodule Logflare.SingleTenantTest do
       user = SingleTenant.get_default_user()
       sources = Sources.list_sources_by_user(user)
 
-      assert length(sources) > 0
-      assert Endpoints.list_endpoints_by(user_id: user.id) |> length() > 0
+      assert is_non_empty_list(sources)
+      assert Endpoints.list_endpoints_by(user_id: user.id) != []
     end
 
     test "supabase_mode_status/0" do
@@ -263,8 +264,8 @@ defmodule Logflare.SingleTenantTest do
       user = SingleTenant.get_default_user()
       sources = Sources.list_sources_by_user(user)
 
-      assert length(sources) > 0
-      assert Endpoints.list_endpoints_by(user_id: user.id) |> length() > 0
+      assert is_non_empty_list(sources)
+      assert Endpoints.list_endpoints_by(user_id: user.id) != []
     end
 
     test "supabase_mode_status/0" do
diff --git a/test/logflare/utils/guards_test.exs b/test/logflare/utils/guards_test.exs
index 90c357b686..11688f2761 100644
--- a/test/logflare/utils/guards_test.exs
+++ b/test/logflare/utils/guards_test.exs
@@ -103,6 +103,29 @@ defmodule Logflare.Utils.GuardsTest do
     end
   end
 
+  describe "is_non_empty_list/1" do
+    test "passes for lists with at least one element" do
+      assert match?(x when is_non_empty_list(x), [1])
+      assert match?(x when is_non_empty_list(x), [1, 2, 3])
+      assert match?(x when is_non_empty_list(x), [nil])
+      assert match?(x when is_non_empty_list(x), foo: 1, bar: 2)
+    end
+
+    test "passes for improper lists" do
+      assert match?(x when is_non_empty_list(x), [1 | 2])
+    end
+
+    test "fails for the empty list" do
+      refute match?(x when is_non_empty_list(x), [])
+    end
+
+    test "fails for non-lists" do
+      for value <- ["list", :list, 1, nil, {1, 2}, %{}] do
+        refute match?(x when is_non_empty_list(x), value)
+      end
+    end
+  end
+
   describe "is_non_empty_map/1" do
     test "passes for maps with at least one key" do
       assert match?(x when is_non_empty_map(x), %{a: 1})
diff --git a/test/support/test_utils.ex b/test/support/test_utils.ex
index 56b9ab84f6..8406f7db5a 100644
--- a/test/support/test_utils.ex
+++ b/test/support/test_utils.ex
@@ -186,7 +186,7 @@ defmodule Logflare.TestUtils do
         schema ->
           schema
 
-        length(results) > 0 ->
+        results != [] ->
           SchemaBuilder.build_table_schema(results |> hd(), SchemaBuilder.initial_table_schema())
 
         true ->