diff --git a/CHANGES.md b/CHANGES.md
index fb65ca68..17a1ffc6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,10 +19,14 @@
   - @voluntas
 - [UPDATE] Boost を 1.86.0 にあげる
   - @voluntas
-- [UPDATE] libwebrtc を m129.6668.1.1 にあげる
+- [UPDATE] libwebrtc を m130.6723.2.0 にあげる
   - H.265 Patch の修正に伴い、C++ SDK の H.265 に関する設定を変更
   - examples と test に `rtc::CreateRandomString` のヘッダを追加
   - `SetRtpTimestamp` を `frame.timestamp` から `frame.rtp_timestamp` に変更
+  - `scalable_track_source.h` と `scalable_track_source.cpp` の `absl::optional` を `std::optional` に変更
+  - `nvcodec_video_decoder.h` と `vpl_video_decoder.h` に `#include <optional>` を追加
+  - `nvcodec_video_decoder.cpp` と `vpl_video_decoder.cpp` の `absl::nullopt` を `std::nullopt` に変更
+  - Android の test アプリの cmake バージョンを VERSION と合わせる
   - @tnoho @torikizi @melpon
 - [UPDATE] Xcode のバージョンを 15.4 にあげる
   - @tnoho
diff --git a/VERSION b/VERSION
index ababc5ac..2763bbfc 100644
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1,5 @@
 SORA_CPP_SDK_VERSION=2024.8.0-canary.25
-WEBRTC_BUILD_VERSION=m129.6668.1.1
+WEBRTC_BUILD_VERSION=m130.6723.2.0
 BOOST_VERSION=1.86.0
 CMAKE_VERSION=3.30.5
 CUDA_VERSION=11.8.0-1
diff --git a/examples/VERSION b/examples/VERSION
index ef3631a6..c8c67019 100644
--- a/examples/VERSION
+++ b/examples/VERSION
@@ -1,5 +1,5 @@
 SORA_CPP_SDK_VERSION=2024.8.0-canary.25
-WEBRTC_BUILD_VERSION=m129.6668.1.1
+WEBRTC_BUILD_VERSION=m130.6723.2.0
 BOOST_VERSION=1.86.0
 CMAKE_VERSION=3.30.5
 SDL2_VERSION=2.30.8
diff --git a/include/sora/hwenc_nvcodec/nvcodec_video_decoder.h b/include/sora/hwenc_nvcodec/nvcodec_video_decoder.h
index ceed5f93..c1efbde9 100644
--- a/include/sora/hwenc_nvcodec/nvcodec_video_decoder.h
+++ b/include/sora/hwenc_nvcodec/nvcodec_video_decoder.h
@@ -1,6 +1,8 @@
 #ifndef SORA_HWENC_NVCODEC_NVCODEC_VIDEO_DECODER_H_
 #define SORA_HWENC_NVCODEC_NVCODEC_VIDEO_DECODER_H_
 
+#include <optional>
+
 // WebRTC
 #include <api/video_codecs/video_decoder.h>
 #include <common_video/include/video_frame_buffer_pool.h>
diff --git a/include/sora/hwenc_vpl/vpl_video_decoder.h b/include/sora/hwenc_vpl/vpl_video_decoder.h
index 2ab8157a..3d34e87b 100644
--- a/include/sora/hwenc_vpl/vpl_video_decoder.h
+++ b/include/sora/hwenc_vpl/vpl_video_decoder.h
@@ -2,6 +2,7 @@
 #define SORA_HWENC_VPL_VPL_VIDEO_DECODER_H_
 
 #include <memory>
+#include <optional>
 
 // WebRTC
 #include <api/video/video_codec_type.h>
diff --git a/include/sora/scalable_track_source.h b/include/sora/scalable_track_source.h
index c8c4d365..7d0b0160 100644
--- a/include/sora/scalable_track_source.h
+++ b/include/sora/scalable_track_source.h
@@ -31,7 +31,7 @@ class ScalableVideoTrackSource : public rtc::AdaptedVideoTrackSource {
   virtual ~ScalableVideoTrackSource();
 
   bool is_screencast() const override;
-  absl::optional<bool> needs_denoising() const override;
+  std::optional<bool> needs_denoising() const override;
   webrtc::MediaSourceInterface::SourceState state() const override;
   bool remote() const override;
   bool OnCapturedFrame(const webrtc::VideoFrame& frame);
diff --git a/src/hwenc_nvcodec/nvcodec_video_decoder.cpp b/src/hwenc_nvcodec/nvcodec_video_decoder.cpp
index cd15b418..16f85ec6 100644
--- a/src/hwenc_nvcodec/nvcodec_video_decoder.cpp
+++ b/src/hwenc_nvcodec/nvcodec_video_decoder.cpp
@@ -113,8 +113,8 @@ int32_t NvCodecVideoDecoder::Decode(const webrtc::EncodedImage& input_image,
                                            .set_video_frame_buffer(i420_buffer)
                                            .set_timestamp_rtp(pts)
                                            .build();
-    decode_complete_callback_->Decoded(decoded_image, absl::nullopt,
-                                       absl::nullopt);
+    decode_complete_callback_->Decoded(decoded_image, std::nullopt,
+                                       std::nullopt);
 
     decoder_->UnlockFrame(frame);
   }
diff --git a/src/hwenc_vpl/vpl_video_decoder.cpp b/src/hwenc_vpl/vpl_video_decoder.cpp
index 5b837ba4..606f6ccc 100644
--- a/src/hwenc_vpl/vpl_video_decoder.cpp
+++ b/src/hwenc_vpl/vpl_video_decoder.cpp
@@ -310,8 +310,8 @@ int32_t VplVideoDecoderImpl::Decode(const webrtc::EncodedImage& input_image,
                                            .set_video_frame_buffer(i420_buffer)
                                            .set_timestamp_rtp(pts)
                                            .build();
-    decode_complete_callback_->Decoded(decoded_image, absl::nullopt,
-                                       absl::nullopt);
+    decode_complete_callback_->Decoded(decoded_image, std::nullopt,
+                                       std::nullopt);
   }
 
   return WEBRTC_VIDEO_CODEC_OK;
diff --git a/src/scalable_track_source.cpp b/src/scalable_track_source.cpp
index f7de5ad7..d8f7b0f5 100644
--- a/src/scalable_track_source.cpp
+++ b/src/scalable_track_source.cpp
@@ -33,7 +33,7 @@ bool ScalableVideoTrackSource::is_screencast() const {
   return false;
 }
 
-absl::optional<bool> ScalableVideoTrackSource::needs_denoising() const {
+std::optional<bool> ScalableVideoTrackSource::needs_denoising() const {
   return false;
 }