diff --git a/crates/lib/database_queries/src/column_types/job_status.rs b/crates/lib/database_queries/src/column_types/job_status.rs
index e3606e50c..05c8db2de 100644
--- a/crates/lib/database_queries/src/column_types/job_status.rs
+++ b/crates/lib/database_queries/src/column_types/job_status.rs
@@ -1,7 +1,7 @@
 //! These are columns where users can control the visibility of their data.
 
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 /// To use this in a query, the query must have type annotations.
 /// See: https://www.gitmemory.com/issue/launchbadge/sqlx/1241/847154375
diff --git a/crates/lib/database_queries/src/column_types/tts_model_type.rs b/crates/lib/database_queries/src/column_types/tts_model_type.rs
index 3492d744b..b4788f247 100644
--- a/crates/lib/database_queries/src/column_types/tts_model_type.rs
+++ b/crates/lib/database_queries/src/column_types/tts_model_type.rs
@@ -1,7 +1,7 @@
 //! These denote the TTS synthesizer model types
 
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, sqlx::Type)]
 #[serde(rename_all = "lowercase")]
diff --git a/crates/lib/database_queries/src/column_types/twitch_event_category.rs b/crates/lib/database_queries/src/column_types/twitch_event_category.rs
index 269b5d9cc..90fc8eb84 100644
--- a/crates/lib/database_queries/src/column_types/twitch_event_category.rs
+++ b/crates/lib/database_queries/src/column_types/twitch_event_category.rs
@@ -1,7 +1,7 @@
 //! These are columns where users can control the visibility of their data.
 
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 /// To use this in a query, the query must have type annotations.
 /// See: https://www.gitmemory.com/issue/launchbadge/sqlx/1241/847154375
diff --git a/crates/lib/database_queries/src/column_types/vocoder_type.rs b/crates/lib/database_queries/src/column_types/vocoder_type.rs
index ec63f25a6..e0abaf795 100644
--- a/crates/lib/database_queries/src/column_types/vocoder_type.rs
+++ b/crates/lib/database_queries/src/column_types/vocoder_type.rs
@@ -1,7 +1,7 @@
 //! These denote the pretrained vocoders
 
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, sqlx::Type)]
 #[serde(rename_all = "lowercase")]
diff --git a/crates/lib/database_queries/src/complex_models/event_responses.rs b/crates/lib/database_queries/src/complex_models/event_responses.rs
index 4c230e954..f421732dd 100644
--- a/crates/lib/database_queries/src/complex_models/event_responses.rs
+++ b/crates/lib/database_queries/src/complex_models/event_responses.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use std::collections::HashMap;
 
 /// How TTS commands should be prefixed: !voiceName, /voiceName, etc.
diff --git a/crates/lib/database_queries/src/mediators/badge_granter.rs b/crates/lib/database_queries/src/mediators/badge_granter.rs
index 9adb4a85d..ed67cb959 100644
--- a/crates/lib/database_queries/src/mediators/badge_granter.rs
+++ b/crates/lib/database_queries/src/mediators/badge_granter.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::mediators::firehose_publisher::FirehosePublisher;
 use log::{warn,info};
 use reusable_types::achievements::user_badge::UserBadge;
diff --git a/crates/lib/database_queries/src/mediators/firehose_publisher.rs b/crates/lib/database_queries/src/mediators/firehose_publisher.rs
index 74825ce83..1749edcac 100644
--- a/crates/lib/database_queries/src/mediators/firehose_publisher.rs
+++ b/crates/lib/database_queries/src/mediators/firehose_publisher.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::tokens::Tokens;
 use log::{warn,info};
 use sqlx::error::Error::Database;
diff --git a/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs b/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs
index 50ee9b4ad..746a0c2aa 100644
--- a/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs
+++ b/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user;
 use crate::tokens::Tokens;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs b/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs
index 7f8f310ba..56c3c57b7 100644
--- a/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs
+++ b/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 pub async fn delete_api_token(
diff --git a/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs b/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs
index 909075c10..a6241100e 100644
--- a/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs
+++ b/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::MySqlPool;
 use std::collections::{HashSet, HashMap};
diff --git a/crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs b/crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs
index 034d24d13..85c822049 100644
--- a/crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs
+++ b/crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{Utc, DateTime};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 /// table: api_tokens
diff --git a/crates/lib/database_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs b/crates/lib/database_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs
index cd7af6e8e..efdad00fb 100644
--- a/crates/lib/database_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs
+++ b/crates/lib/database_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, NaiveDateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::i8_to_bool;
 use log::warn;
 use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus;
diff --git a/crates/lib/database_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs b/crates/lib/database_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs
index dc09ff4db..bdd626f63 100644
--- a/crates/lib/database_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs
+++ b/crates/lib/database_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::NaiveDateTime;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 // TODO: Make a trait with default impls to handle common query concerns.
diff --git a/crates/lib/database_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs b/crates/lib/database_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs
index 998bbdacd..12d31f18c 100644
--- a/crates/lib/database_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs
+++ b/crates/lib/database_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::Utc;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::job_status::JobStatus;
 use crate::queries::generic_download::job::_keys::GenericDownloadJobId;
 use crate::tokens::Tokens;
diff --git a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs
index fdc6de7e6..006568d8d 100644
--- a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs
+++ b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs
index b6de45c92..c21c3d0fd 100644
--- a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs
+++ b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;
 use sqlx::MySqlPool;
 use sqlx;
diff --git a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs
index be5ab7478..7e7370d8e 100644
--- a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs
+++ b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 use sqlx;
 use crate::queries::generic_download::job::_keys::GenericDownloadJobId;
diff --git a/crates/lib/database_queries/src/queries/generic_download/web/get_generic_download_job_status.rs b/crates/lib/database_queries/src/queries/generic_download/web/get_generic_download_job_status.rs
index ef1d035db..a2466c359 100644
--- a/crates/lib/database_queries/src/queries/generic_download/web/get_generic_download_job_status.rs
+++ b/crates/lib/database_queries/src/queries/generic_download/web/get_generic_download_job_status.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::MySqlPool;
 use tokens::jobs::download::DownloadJobToken;
diff --git a/crates/lib/database_queries/src/queries/generic_download/web/insert_generic_download_job.rs b/crates/lib/database_queries/src/queries/generic_download/web/insert_generic_download_job.rs
index 29546e061..fe8da4245 100644
--- a/crates/lib/database_queries/src/queries/generic_download/web/insert_generic_download_job.rs
+++ b/crates/lib/database_queries/src/queries/generic_download/web/insert_generic_download_job.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use enums::common::visibility::Visibility;
 use enums::workers::generic_download_type::GenericDownloadType;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs b/crates/lib/database_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs
index 492c9a98b..5c0487007 100644
--- a/crates/lib/database_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs
+++ b/crates/lib/database_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::Utc;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::job_status::JobStatus;
 use crate::helpers::boolean_converters::i8_to_bool;
 use crate::queries::generic_inference::job::_keys::GenericInferenceJobId;
diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs
index 8ee46fd3d..6e58a8deb 100644
--- a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs
+++ b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs
index aa33c8846..b3647447a 100644
--- a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs
+++ b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use sqlx::MySqlPool;
 use sqlx;
diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs
index ace949469..f15833d1b 100644
--- a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs
+++ b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::generic_inference::job::_keys::GenericInferenceJobId;
 use sqlx::MySqlPool;
 use sqlx;
diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs
index 1fbeec22c..e8dfb01e3 100644
--- a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs
+++ b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs b/crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs
index f9cffd230..536ec7f62 100644
--- a/crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs
+++ b/crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::MySqlPool;
 use tokens::jobs::inference::InferenceJobToken;
diff --git a/crates/lib/database_queries/src/queries/health_check/health_check_query.rs b/crates/lib/database_queries/src/queries/health_check/health_check_query.rs
index 847f77e20..e831cfbe4 100644
--- a/crates/lib/database_queries/src/queries/health_check/health_check_query.rs
+++ b/crates/lib/database_queries/src/queries/health_check/health_check_query.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{Utc, DateTime, NaiveDateTime};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 /// This just queries for current time. If it fails, we know the connection pool is dead.
diff --git a/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs b/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs
index 4bff64250..25b99fae0 100644
--- a/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs
+++ b/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs b/crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs
index d731475ee..fbacd8149 100644
--- a/crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs
+++ b/crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use buckets::public::media_uploads::original_file::MediaUploadOriginalFilePath;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::payloads::media_upload_details::MediaUploadDetails;
 use enums::by_table::media_uploads::media_upload_type::MediaUploadType;
 use enums::common::visibility::Visibility;
diff --git a/crates/lib/database_queries/src/queries/model_categories/create_category.rs b/crates/lib/database_queries/src/queries/model_categories/create_category.rs
index 2112cfebc..47b2ee093 100644
--- a/crates/lib/database_queries/src/queries/model_categories/create_category.rs
+++ b/crates/lib/database_queries/src/queries/model_categories/create_category.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use sqlx::MySqlPool;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 pub struct CreateCategoryArgs<'a> {
   pub category_token: &'a str,
diff --git a/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs b/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs
index 5d5b71b0d..f08a1121d 100644
--- a/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs
+++ b/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool};
 use log::{info, warn, log};
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs b/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs
index 5744d1058..7bc609712 100644
--- a/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs
+++ b/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool};
 use log::{warn, info};
 use sqlx::{MySql, MySqlPool};
diff --git a/crates/lib/database_queries/src/queries/model_categories/update_model_category.rs b/crates/lib/database_queries/src/queries/model_categories/update_model_category.rs
index d82a735a7..ee65b5b98 100644
--- a/crates/lib/database_queries/src/queries/model_categories/update_model_category.rs
+++ b/crates/lib/database_queries/src/queries/model_categories/update_model_category.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use sqlx::MySqlPool;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 pub struct UpdateModelCategoryArgs<'a> {
   pub name: &'a str,
diff --git a/crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs b/crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs
index b3658bf5f..275d40516 100644
--- a/crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs
+++ b/crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs b/crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs
index f8ad1bb5c..9156da544 100644
--- a/crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs
+++ b/crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs b/crates/lib/database_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs
index 3775af39c..8ba4e686d 100644
--- a/crates/lib/database_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs
+++ b/crates/lib/database_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use enums::by_table::trending_model_analytics::model_type::ModelType;
 use enums::by_table::trending_model_analytics::window_name::WindowName;
 use sqlx::MySql;
diff --git a/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs b/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs
index e645f2091..a6927b436 100644
--- a/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs
+++ b/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::{MySql, MySqlPool};
 use sqlx::pool::PoolConnection;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs
index 5eb5cb0bd..90bbc30d0 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs
@@ -4,7 +4,7 @@
 #![forbid(unused_variables)]
 
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::pool::PoolConnection;
 use sqlx::{MySql, MySqlPool};
diff --git a/crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs
index 38c753adf..b2baae342 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool};
 use log::{warn, info};
 use sqlx::{MySql, MySqlPool};
diff --git a/crates/lib/database_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs b/crates/lib/database_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs
index 9b810882e..8de86f980 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::Utc;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::tokens::Tokens;
 use sqlx::MySqlPool;
 use std::path::Path;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs
index 9f81d0adf..5c33ab509 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs
@@ -1,5 +1,5 @@
 use chrono::NaiveDateTime;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::numeric_converters::try_i64_to_u64_or_min;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs
index 34213a9f8..a1a78282a 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use container_common::token::random_uuid::generate_random_uuid;
 use crate::builders::RequiredOption;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs
index 5e5f4e674..56aa62ec2 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::mysql::MySqlArguments;
 use sqlx::query::Query;
 use sqlx::{MySqlPool, MySql};
diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs
index 5bc8379d6..fee3421bc 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs
@@ -4,7 +4,7 @@
 #![forbid(unused_variables)]
 
 use chrono::{Utc, DateTime};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::job_status::JobStatus;
 use crate::helpers::boolean_converters::i8_to_bool;
 use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs
index 181693347..f0e88685f 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId;
 use sqlx::MySqlPool;
 use sqlx;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs
index ea0c6fec6..960aa5b03 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob;
 use sqlx::MySqlPool;
 use sqlx;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs
index 2c8ae40f9..97a52479f 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId;
 use sqlx::MySqlPool;
 use sqlx;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs
index 19e2de037..b30904656 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId;
 use sqlx::MySqlPool;
 use sqlx;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs b/crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs
index f01091e14..7fce6a24d 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 pub async fn delete_tts_model_as_user(
diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs b/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs
index a5cd2bdcc..33d42d40d 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs
@@ -5,7 +5,7 @@
 
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::vocoder_type::VocoderType;
 use crate::helpers::boolean_converters::i8_to_bool;
 use enums::common::visibility::Visibility;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs b/crates/lib/database_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs
index 04e2a6c15..e90efe7fe 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::Utc;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob;
 use crate::tokens::Tokens;
 use enums::common::visibility::Visibility;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs b/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs
index b67377d24..42c3808fc 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::i8_to_bool;
 use log::{warn, info};
 use sqlx::pool::PoolConnection;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs b/crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs
index c5ca6f2f3..e2815ea50 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 pub async fn delete_tts_inference_result_as_user(
diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs b/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs
index 8839e9bd6..0471220cd 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::vocoder_type::VocoderType;
 use crate::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob;
 use crate::tokens::Tokens;
diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs b/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs
index 406126c73..aebde20c1 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs
@@ -5,7 +5,7 @@
 
 use chrono::{DateTime, Utc};
 use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use enums::common::visibility::Visibility;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs b/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs
index 402ccb837..80a5dd7cc 100644
--- a/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs
+++ b/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs
@@ -5,7 +5,7 @@
 
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::vocoder_type::VocoderType;
 use crate::helpers::boolean_converters::{nullable_i8_to_bool, i8_to_bool};
 use enums::common::visibility::Visibility;
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs
index 914856bb9..fbf19aa6b 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 pub async fn delete_twitch_event_rule(
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs
index fb370cd05..5a4ee4c59 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{Utc, DateTime};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::twitch_event_category::TwitchEventCategory;
 use crate::helpers::boolean_converters::i8_to_bool;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs
index d186c9a06..0bb6b51a2 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::twitch_event_category::TwitchEventCategory;
 use crate::tokens::Tokens;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs
index 6d7976dbd..283a7f1ea 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{Utc, DateTime};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::twitch_event_category::TwitchEventCategory;
 use crate::helpers::boolean_converters::i8_to_bool;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs
index 76a3f874b..65ac494f9 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::error;
 use once_cell::sync::Lazy;
 use regex::Regex;
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs
index 08b07b384..81435522e 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::tokens::Tokens;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs
index 09274990a..c918229dc 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs
@@ -2,7 +2,7 @@
 
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::i8_to_bool;
 use log::error;
 use log::warn;
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs
index 3786075c5..f3ba5a5af 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::info;
 use log::warn;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs
index 889d25dd4..7bd33d573 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::info;
 use log::warn;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs
index 001055e6b..9104f8c5f 100644
--- a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs
+++ b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::info;
 use log::warn;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs b/crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs
index 6c40f62bc..7b9d2dbe3 100644
--- a/crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs
+++ b/crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs
@@ -1,5 +1,5 @@
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::i8_to_bool;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_email.rs b/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_email.rs
index 0d9b7e82a..7da34b89c 100644
--- a/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_email.rs
+++ b/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_email.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::users::user::lookup_user_for_login_result::UserRecordForLogin;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_username.rs b/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_username.rs
index 199372214..15cacbfff 100644
--- a/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_username.rs
+++ b/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_username.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::queries::users::user::lookup_user_for_login_result::UserRecordForLogin;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs b/crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs
index f4c95848a..9740ae805 100644
--- a/crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs
+++ b/crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use sqlx::MySqlPool;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use tokens::users::user::UserToken;
 
 pub struct SetUserBanStatsArgs<'a> {
diff --git a/crates/lib/database_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs b/crates/lib/database_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs
index fe55b0710..69bc00f34 100644
--- a/crates/lib/database_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs
+++ b/crates/lib/database_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 pub async fn update_user_record_with_new_stripe_customer_id(
diff --git a/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs b/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs
index 6b1250bc0..d17d4dff7 100644
--- a/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs
+++ b/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::{warn, info};
 use sqlx::{MySql, MySqlPool};
 use sqlx::pool::PoolConnection;
diff --git a/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs b/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs
index b801ae7fb..d7f1963f6 100644
--- a/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs
+++ b/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs
@@ -4,7 +4,7 @@
 #![forbid(unused_variables)]
 
 use sqlx::MySqlPool;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 pub struct Args<'a> {
   pub user_token: &'a str,
diff --git a/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs b/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs
index 9cba65569..ba03a252c 100644
--- a/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs
+++ b/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs
@@ -4,7 +4,7 @@
 #![forbid(unused_variables)]
 
 use sqlx::MySqlPool;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 pub struct Args<'a> {
   pub user_token: &'a str,
diff --git a/crates/lib/database_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs b/crates/lib/database_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs
index 5f6340a5d..d71cf3c33 100644
--- a/crates/lib/database_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs
+++ b/crates/lib/database_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::i8_to_bool;
 use enums::common::visibility::Visibility;
 use log::{info, warn, log};
diff --git a/crates/lib/database_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs b/crates/lib/database_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs
index b50eae91f..7768e1dbb 100644
--- a/crates/lib/database_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs
+++ b/crates/lib/database_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySql;
 use sqlx::pool::PoolConnection;
 use tokens::tokens::tts_models::TtsModelToken;
diff --git a/crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs b/crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs
index fb3c0f88b..c590bbd45 100644
--- a/crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs
+++ b/crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity;
 use enums::by_table::user_ratings::entity_type::UserRatingEntityType;
 use enums::by_table::user_ratings::rating_value::UserRatingValue;
diff --git a/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs b/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs
index 652c5402d..2be6d268b 100644
--- a/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs
+++ b/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::i8_to_bool;
 use log::{warn, info};
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs b/crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs
index 4133d139b..36207b86d 100644
--- a/crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs
+++ b/crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::tokens::Tokens;
 use log::{info, warn};
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs b/crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs
index db7dd1e86..17bbabce3 100644
--- a/crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs
+++ b/crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 pub async fn delete_user_session(session_token: &str, mysql_pool: &MySqlPool) -> AnyhowResult<()> {
diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token.rs b/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token.rs
index b40aab55a..248f230ef 100644
--- a/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token.rs
+++ b/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token.rs
@@ -3,7 +3,7 @@
 #![forbid(unused_mut)]
 
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool, nullable_i8_to_bool_default_false};
 use enums::common::visibility::Visibility;
 use log::warn;
diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs b/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs
index 2cf18a532..92ddde72c 100644
--- a/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs
+++ b/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs
@@ -3,7 +3,7 @@
 #![forbid(unused_mut)]
 
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::MySql;
 use sqlx::pool::PoolConnection;
diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs b/crates/lib/database_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs
index 7485ffdd4..f33639d12 100644
--- a/crates/lib/database_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs
+++ b/crates/lib/database_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, NaiveDateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::nullable_i8_to_optional_bool;
 use log::warn;
 use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus;
diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs b/crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs
index 559c1fb38..059254023 100644
--- a/crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs
+++ b/crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::info;
 use log::warn;
 use sqlx::MySql;
diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs b/crates/lib/database_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs
index 801fd8806..c8a2d1ce2 100644
--- a/crates/lib/database_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs
+++ b/crates/lib/database_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs
@@ -1,7 +1,7 @@
 use chrono::{DateTime, Utc};
 use sqlx::{MySql, MySqlPool};
 use sqlx::pool::PoolConnection;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 pub struct ActiveUserSubscription {
     pub user_token: String,
diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs b/crates/lib/database_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs
index 79a28c1d6..cdcd7cf28 100644
--- a/crates/lib/database_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs
+++ b/crates/lib/database_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::NaiveDateTime;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::tokens::Tokens;
 use reusable_types::stripe::stripe_recurring_interval::StripeRecurringInterval;
 use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus;
diff --git a/crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs b/crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs
index a3cfabf2e..16e1f501c 100644
--- a/crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs
+++ b/crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs
@@ -5,7 +5,7 @@
 
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::i8_to_bool;
 use enums::common::visibility::Visibility;
 use enums::common::vocoder_type::VocoderType;
diff --git a/crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs b/crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs
index c17653715..0814da466 100644
--- a/crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs
+++ b/crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs
@@ -4,7 +4,7 @@
 #![forbid(unused_variables)]
 
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::tokens::Tokens;
 use enums::common::visibility::Visibility;
 use enums::common::vocoder_type::VocoderType;
diff --git a/crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs b/crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs
index cdd681d72..ddca22ab2 100644
--- a/crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs
+++ b/crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs
@@ -5,7 +5,7 @@
 
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::i8_to_bool;
 use enums::common::vocoder_type::VocoderType;
 use log::{warn, info};
diff --git a/crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs b/crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs
index 8da3ac7f5..0c2d803e6 100644
--- a/crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs
+++ b/crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{Utc, DateTime};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::twitch_event_category::TwitchEventCategory;
 use crate::helpers::boolean_converters::i8_to_bool;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs b/crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs
index 009d87c05..ae8ac325a 100644
--- a/crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs
+++ b/crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::column_types::twitch_event_category::TwitchEventCategory;
 use crate::tokens::Tokens;
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs b/crates/lib/database_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs
index 4c86c5d7c..121febc5d 100644
--- a/crates/lib/database_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs
+++ b/crates/lib/database_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::Utc;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use enums::common::visibility::Visibility;
 use sqlx::MySqlPool;
 use std::path::Path;
diff --git a/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs b/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs
index 9f648e958..97aa84ada 100644
--- a/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs
+++ b/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use log::warn;
 use sqlx::{MySql, MySqlPool};
 use sqlx::pool::PoolConnection;
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs b/crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs
index d0c23a873..ca772f158 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs
@@ -4,7 +4,7 @@
 
 use anyhow::anyhow;
 use chrono::Utc;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::tokens::Tokens;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs b/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs
index 7c3915267..d915fc919 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs
@@ -2,7 +2,7 @@ use anyhow::anyhow;
 use sqlx::error::Error::Database;
 use log::error;
 use sqlx::MySqlPool;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use enums::common::visibility::Visibility;
 
 // FIXME: NB: This is an old query that was somewhat modernized when moved.
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs b/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs
index ccce971a5..de8085768 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs
@@ -4,7 +4,7 @@
 
 use anyhow::anyhow;
 use chrono::{Utc, DateTime};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::tokens::Tokens;
 use enums::common::visibility::Visibility;
 use log::{warn, info};
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs
index adaced9ac..be4964b00 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 pub async fn delete_w2l_inference_result_as_user(
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs
index d85389702..d526c6492 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs
@@ -5,7 +5,7 @@
 
 use chrono::{DateTime, Utc};
 use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use enums::common::visibility::Visibility;
 use sqlx::MySqlPool;
 
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs
index 26d47f55f..5f383e4dd 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs
@@ -5,7 +5,7 @@
 
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::nullable_i8_to_bool;
 use enums::common::visibility::Visibility;
 use log::warn;
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs b/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs
index 975637e8c..43186ac3d 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs
@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
 use sqlx::MySqlPool;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 
 pub struct W2lUploadTemplateJobStatusRecord {
   pub job_token: String,
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs b/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs
index b14864d46..a65aaaa97 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use sqlx::MySqlPool;
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::error::Error::Database;
 use crate::tokens::Tokens;
 
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs
index 308684434..712392f57 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use sqlx::MySqlPool;
 
 pub async fn delete_w2l_template_as_user(
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs
index db534a43e..433a77f8e 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs
@@ -5,7 +5,7 @@
 
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool};
 use enums::common::visibility::Visibility;
 use log::warn;
diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs
index f39e10c20..12df06c5d 100644
--- a/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs
+++ b/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use crate::helpers::boolean_converters::nullable_i8_to_optional_bool;
 use log::{warn, info};
 use sqlx::MySqlPool;
diff --git a/crates/lib/database_queries/src/tokens.rs b/crates/lib/database_queries/src/tokens.rs
index c3e838129..95d2a13eb 100644
--- a/crates/lib/database_queries/src/tokens.rs
+++ b/crates/lib/database_queries/src/tokens.rs
@@ -1,4 +1,4 @@
-use container_common::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
 use container_common::token::random_prefix_crockford_token::random_prefix_crockford_token;
 
 /// Central place to define all the token types.