diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index 0d5d13d03d..138fdff4f0 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -103,8 +103,16 @@ if (!build_with_chromium) {
         "../../../api/test/pclf:media_quality_test_params",
         "../../../api/test/pclf:peer_configurer",
         "../../../api/transport:field_trial_based_config",
-        "../../../api/video_codecs:builtin_video_decoder_factory",
-        "../../../api/video_codecs:builtin_video_encoder_factory",
+        "../../../api/video_codecs:video_decoder_factory_template",
+        "../../../api/video_codecs:video_decoder_factory_template_dav1d_adapter",
+        "../../../api/video_codecs:video_decoder_factory_template_libvpx_vp8_adapter",
+        "../../../api/video_codecs:video_decoder_factory_template_libvpx_vp9_adapter",
+        "../../../api/video_codecs:video_decoder_factory_template_open_h264_adapter",
+        "../../../api/video_codecs:video_encoder_factory_template",
+        "../../../api/video_codecs:video_encoder_factory_template_libaom_av1_adapter",
+        "../../../api/video_codecs:video_encoder_factory_template_libvpx_vp8_adapter",
+        "../../../api/video_codecs:video_encoder_factory_template_libvpx_vp9_adapter",
+        "../../../api/video_codecs:video_encoder_factory_template_open_h264_adapter",
         "../../../media:rtc_audio_video",
         "../../../media:rtc_media_engine_defaults",
         "../../../modules/audio_device:audio_device_impl",
diff --git a/test/pc/e2e/test_peer_factory.cc b/test/pc/e2e/test_peer_factory.cc
index 858676fd7a..d03a98d996 100644
--- a/test/pc/e2e/test_peer_factory.cc
+++ b/test/pc/e2e/test_peer_factory.cc
@@ -9,6 +9,7 @@
  */
 #include "test/pc/e2e/test_peer_factory.h"
 
+#include <memory>
 #include <utility>
 
 #include "absl/memory/memory.h"
@@ -19,8 +20,16 @@
 #include "api/test/pclf/peer_configurer.h"
 #include "api/test/time_controller.h"
 #include "api/transport/field_trial_based_config.h"
-#include "api/video_codecs/builtin_video_decoder_factory.h"
-#include "api/video_codecs/builtin_video_encoder_factory.h"
+#include "api/video_codecs/video_decoder_factory_template.h"
+#include "api/video_codecs/video_decoder_factory_template_dav1d_adapter.h"
+#include "api/video_codecs/video_decoder_factory_template_libvpx_vp8_adapter.h"
+#include "api/video_codecs/video_decoder_factory_template_libvpx_vp9_adapter.h"
+#include "api/video_codecs/video_decoder_factory_template_open_h264_adapter.h"
+#include "api/video_codecs/video_encoder_factory_template.h"
+#include "api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h"
+#include "api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h"
+#include "api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h"
+#include "api/video_codecs/video_encoder_factory_template_open_h264_adapter.h"
 #include "media/engine/webrtc_media_engine.h"
 #include "media/engine/webrtc_media_engine_defaults.h"
 #include "modules/audio_processing/aec_dump/aec_dump_factory.h"
@@ -185,7 +194,9 @@ void WrapVideoEncoderFactory(
   if (pcf_dependencies->video_encoder_factory != nullptr) {
     video_encoder_factory = std::move(pcf_dependencies->video_encoder_factory);
   } else {
-    video_encoder_factory = CreateBuiltinVideoEncoderFactory();
+    video_encoder_factory = std::make_unique<VideoEncoderFactoryTemplate<
+        LibvpxVp8EncoderTemplateAdapter, LibvpxVp9EncoderTemplateAdapter,
+        OpenH264EncoderTemplateAdapter, LibaomAv1EncoderTemplateAdapter>>();
   }
   pcf_dependencies->video_encoder_factory =
       video_analyzer_helper->WrapVideoEncoderFactory(
@@ -201,7 +212,9 @@ void WrapVideoDecoderFactory(
   if (pcf_dependencies->video_decoder_factory != nullptr) {
     video_decoder_factory = std::move(pcf_dependencies->video_decoder_factory);
   } else {
-    video_decoder_factory = CreateBuiltinVideoDecoderFactory();
+    video_decoder_factory = std::make_unique<VideoDecoderFactoryTemplate<
+        LibvpxVp8DecoderTemplateAdapter, LibvpxVp9DecoderTemplateAdapter,
+        OpenH264DecoderTemplateAdapter, Dav1dDecoderTemplateAdapter>>();
   }
   pcf_dependencies->video_decoder_factory =
       video_analyzer_helper->WrapVideoDecoderFactory(