diff --git a/lib/completions/dialects/claude.rb b/lib/completions/dialects/claude.rb
index 2c6fd131..bf43d9b7 100644
--- a/lib/completions/dialects/claude.rb
+++ b/lib/completions/dialects/claude.rb
@@ -6,9 +6,7 @@ module DiscourseAi
       class Claude < Dialect
         class << self
           def can_translate?(model_name)
-            %w[claude-instant-1 claude-2 claude-3-haiku claude-3-sonnet claude-3-opus].include?(
-              model_name,
-            )
+            model_name.start_with?("claude") || model_name.start_with?("anthropic")
           end
         end
 
diff --git a/lib/completions/endpoints/aws_bedrock.rb b/lib/completions/endpoints/aws_bedrock.rb
index d0ef6274..0087a981 100644
--- a/lib/completions/endpoints/aws_bedrock.rb
+++ b/lib/completions/endpoints/aws_bedrock.rb
@@ -78,6 +78,8 @@ module DiscourseAi
               "anthropic.claude-instant-v1"
             when "claude-3-opus"
               "anthropic.claude-3-opus-20240229-v1:0"
+            else
+              model
             end
 
           api_url =