diff --git a/audio/audiofx/src/audioecho/imp.rs b/audio/audiofx/src/audioecho/imp.rs
index 1108f881..0d076e76 100644
--- a/audio/audiofx/src/audioecho/imp.rs
+++ b/audio/audiofx/src/audioecho/imp.rs
@@ -209,9 +209,8 @@ impl ElementImpl for AudioEcho {
 
     fn pad_templates() -> &'static [gst::PadTemplate] {
         static PAD_TEMPLATES: Lazy<Vec<gst::PadTemplate>> = Lazy::new(|| {
-            let caps = gst_audio::AudioCapsBuilder::new()
+            let caps = gst_audio::AudioCapsBuilder::new_interleaved()
                 .format_list([gst_audio::AUDIO_FORMAT_F32, gst_audio::AUDIO_FORMAT_F64])
-                .layout(gst_audio::AudioLayout::Interleaved)
                 .build();
             let src_pad_template = gst::PadTemplate::new(
                 "src",
diff --git a/audio/audiofx/src/audioloudnorm/imp.rs b/audio/audiofx/src/audioloudnorm/imp.rs
index 44b2618e..ae3279e1 100644
--- a/audio/audiofx/src/audioloudnorm/imp.rs
+++ b/audio/audiofx/src/audioloudnorm/imp.rs
@@ -1880,10 +1880,9 @@ impl ElementImpl for AudioLoudNorm {
 
     fn pad_templates() -> &'static [gst::PadTemplate] {
         static PAD_TEMPLATES: Lazy<Vec<gst::PadTemplate>> = Lazy::new(|| {
-            let caps = gst_audio::AudioCapsBuilder::new()
+            let caps = gst_audio::AudioCapsBuilder::new_interleaved()
                 .format(gst_audio::AUDIO_FORMAT_F64)
                 .rate(192_000)
-                .layout(gst_audio::AudioLayout::Interleaved)
                 .build();
             let src_pad_template = gst::PadTemplate::new(
                 "src",
diff --git a/audio/audiofx/src/audiornnoise/imp.rs b/audio/audiofx/src/audiornnoise/imp.rs
index d27bf063..4454815e 100644
--- a/audio/audiofx/src/audiornnoise/imp.rs
+++ b/audio/audiofx/src/audiornnoise/imp.rs
@@ -224,10 +224,9 @@ impl ElementImpl for AudioRNNoise {
 
     fn pad_templates() -> &'static [gst::PadTemplate] {
         static PAD_TEMPLATES: Lazy<Vec<gst::PadTemplate>> = Lazy::new(|| {
-            let caps = gst_audio::AudioCapsBuilder::new()
+            let caps = gst_audio::AudioCapsBuilder::new_interleaved()
                 .format(gst_audio::AUDIO_FORMAT_F32)
                 .rate(48000)
-                .layout(gst_audio::AudioLayout::Interleaved)
                 .build();
             let src_pad_template = gst::PadTemplate::new(
                 "src",
diff --git a/audio/claxon/src/claxondec/imp.rs b/audio/claxon/src/claxondec/imp.rs
index d2c05f6e..a2d99e10 100644
--- a/audio/claxon/src/claxondec/imp.rs
+++ b/audio/claxon/src/claxondec/imp.rs
@@ -76,7 +76,7 @@ impl ElementImpl for ClaxonDec {
             )
             .unwrap();
 
-            let src_caps = gst_audio::AudioCapsBuilder::new()
+            let src_caps = gst_audio::AudioCapsBuilder::new_interleaved()
                 .format_list([
                     gst_audio::AudioFormat::S8,
                     gst_audio::AUDIO_FORMAT_S16,
@@ -85,7 +85,6 @@ impl ElementImpl for ClaxonDec {
                 ])
                 .rate_range(1..655_350)
                 .channels_range(1..8)
-                .layout(gst_audio::AudioLayout::Interleaved)
                 .build();
             let src_pad_template = gst::PadTemplate::new(
                 "src",
diff --git a/audio/claxon/tests/claxondec.rs b/audio/claxon/tests/claxondec.rs
index 31b327ea..2974b640 100644
--- a/audio/claxon/tests/claxondec.rs
+++ b/audio/claxon/tests/claxondec.rs
@@ -31,8 +31,7 @@ fn test_mono_s16() {
 
     assert_eq!(
         caps,
-        gst_audio::AudioCapsBuilder::new()
-            .layout(gst_audio::AudioLayout::Interleaved)
+        gst_audio::AudioCapsBuilder::new_interleaved()
             .format(gst_audio::AUDIO_FORMAT_S16)
             .rate(44_100)
             .channels(1)
diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs
index 4972fea3..acf79564 100644
--- a/audio/csound/src/filter/imp.rs
+++ b/audio/csound/src/filter/imp.rs
@@ -453,9 +453,8 @@ impl ElementImpl for CsoundFilter {
 
     fn pad_templates() -> &'static [gst::PadTemplate] {
         static PAD_TEMPLATES: Lazy<Vec<gst::PadTemplate>> = Lazy::new(|| {
-            let caps = gst_audio::AudioCapsBuilder::new()
+            let caps = gst_audio::AudioCapsBuilder::new_interleaved()
                 .format(gst_audio::AUDIO_FORMAT_F64)
-                .layout(gst_audio::AudioLayout::Interleaved)
                 .build();
             let src_pad_template = gst::PadTemplate::new(
                 "src",
diff --git a/video/flavors/src/flvdemux/imp.rs b/video/flavors/src/flvdemux/imp.rs
index 44a33db3..b2a42a83 100644
--- a/video/flavors/src/flvdemux/imp.rs
+++ b/video/flavors/src/flvdemux/imp.rs
@@ -215,8 +215,7 @@ impl ElementImpl for FlvDemux {
                         .build(),
                 );
                 caps.append(
-                    gst_audio::AudioCapsBuilder::new()
-                        .layout(gst_audio::AudioLayout::Interleaved)
+                    gst_audio::AudioCapsBuilder::new_interleaved()
                         .format_list([gst_audio::AudioFormat::U8, gst_audio::AudioFormat::S16le])
                         .build(),
                 );
@@ -1280,8 +1279,7 @@ impl AudioFormat {
                     // Assume little-endian for "PCM_NE", it's probably more common and we have no
                     // way to know what the endianness of the system creating the stream was
                     Some(
-                        gst_audio::AudioCapsBuilder::new()
-                            .layout(gst_audio::AudioLayout::Interleaved)
+                        gst_audio::AudioCapsBuilder::new_interleaved()
                             .format(if self.width == 8 {
                                 gst_audio::AudioFormat::U8
                             } else {