diff --git a/lib/modules/embeddings/vector_representations/base.rb b/lib/modules/embeddings/vector_representations/base.rb
index e89bf259..7e4c66a8 100644
--- a/lib/modules/embeddings/vector_representations/base.rb
+++ b/lib/modules/embeddings/vector_representations/base.rb
@@ -24,10 +24,7 @@ module DiscourseAi
             USING
               ivfflat (embeddings #{pg_index_type})
             WITH
-              (lists = #{lists})
-            WHERE
-              model_version = #{version} AND
-              strategy_version = #{@strategy.version};
+              (lists = #{lists});
             SQL
         end
 
diff --git a/lib/tasks/modules/embeddings/database.rake b/lib/tasks/modules/embeddings/database.rake
index 875682e7..6bec6765 100644
--- a/lib/tasks/modules/embeddings/database.rake
+++ b/lib/tasks/modules/embeddings/database.rake
@@ -33,8 +33,10 @@ task "ai:embeddings:index", [:work_mem] => [:environment] do |_, args|
   vector_representation_klass = DiscourseAi::Embeddings::Vectors::Base.find_vector_representation
   strategy = DiscourseAi::Embeddings::Strategies::Truncation.new
 
-  DB.exec("SET work_mem TO '#{args[:work_mem] || "1GB"}';")
+  DB.exec("SET work_mem TO '#{args[:work_mem] || "100MB"}';")
+  DB.exec("SET maintenance_work_mem TO '#{args[:work_mem] || "100MB"}';")
   vector_representation_klass.new(strategy).create_index(lists, probes)
   DB.exec("RESET work_mem;")
-  DB.exec("SET ivfflat.probes = #{probes};")
+  DB.exec("RESET maintenance_work_mem;")
+  DB.exec("ALTER SYSTEM SET ivfflat.probes = #{probes};")
 end