diff --git a/Tools/jhbuild/jhbuild-minimal-plus-gstreamer.modules b/Tools/jhbuild/jhbuild-minimal-plus-gstreamer.modules
deleted file mode 100644
index 2225cb911e46..000000000000
--- a/Tools/jhbuild/jhbuild-minimal-plus-gstreamer.modules
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-
-  <include href="jhbuild-minimal.modules"/>
-  <include href="../gstreamer/jhbuild.modules"/>
-
-  <metamodule id="webkitgtk-minimal-plus-gstreamer-dependencies">
-    <dependencies>
-      <dep package="webkitgtk-minimal-dependencies"/>
-      <dep package="webkit-gstreamer-testing-dependencies"/>
-    </dependencies>
-  </metamodule>
-
-  <metamodule id="webkitwpe-minimal-plus-gstreamer-dependencies">
-    <dependencies>
-      <dep package="webkitwpe-minimal-dependencies"/>
-      <dep package="webkit-gstreamer-testing-dependencies"/>
-    </dependencies>
-  </metamodule>
-
-</moduleset>
diff --git a/Tools/jhbuild/jhbuild-minimal.modules b/Tools/jhbuild/jhbuild-minimal.modules
index 9c4870249367..cfd8820a7212 100644
--- a/Tools/jhbuild/jhbuild-minimal.modules
+++ b/Tools/jhbuild/jhbuild-minimal.modules
@@ -3,8 +3,6 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
 
-  <include href="../gstreamer/jhbuild.modules"/>
-
   <metamodule id="webkitgtk-minimal-dependencies">
     <dependencies>
       <dep package="wpebackend-fdo"/>
@@ -19,6 +17,7 @@
       <dep package="libsoup"/>
       <dep package="wayland"/>
       <dep package="wayland-protocols"/>
+      <dep package="webkit-gstreamer-minimal-dependencies"/>
     </dependencies>
   </metamodule>
 
@@ -36,6 +35,7 @@
       <dep package="libsoup"/>
       <dep package="wayland"/>
       <dep package="wayland-protocols"/>
+      <dep package="webkit-gstreamer-minimal-dependencies"/>
     </dependencies>
   </metamodule>
 
@@ -74,6 +74,12 @@
       href="http://webkitgtk.org/jhbuild_mirror/"/>
   <repository type="tarball" name="gnupg.org"
       href="https://www.gnupg.org/ftp/gcrypt/"/>
+  <repository type="tarball" name="gstreamer"
+      href="https://github.com/GStreamer/" />
+  <repository type="git" name="aomedia.googlesource.com"
+      href="https://aomedia.googlesource.com/"/>
+  <repository type="tarball" name="ffmpeg" href="https://ffmpeg.org/releases/"/>
+
 
   <!-- meson 0.62.0  required to build gstreamer-1.22.7 -->
   <distutils id="meson" python3="1">
@@ -269,4 +275,130 @@
             repo="git.freedesktop.org" />
   </meson>
 
+
+  <metamodule id="webkit-gstreamer-minimal-dependencies">
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+      <dep package="gst-plugins-bad"/>
+      <dep package="gst-libav"/>
+  </metamodule>
+
+
+  <meson id="orc" mesonargs="-Dgtk_doc=disabled -Dexamples=disabled">
+    <branch repo="gstreamer"
+            module="orc/archive/refs/tags/${version}.tar.gz"
+            rename-tarball="orc-${version}.tar.gz"
+            checkoutdir="orc-${version}.tar.gz"
+            version="0.4.32"
+            hash="sha256:6a7349d2ab4a73476cd4de36212e8c3c6524998081aaa04cf3a891ef792dd50f">
+    </branch>
+  </meson>
+
+  <meson id="openh264" mesonargs="-Dtests=disabled">
+    <branch repo="github.com"
+            module="cisco/openh264.git"
+            tag="v2.3.0" >
+    </branch>
+  </meson>
+
+  <cmake id="aom" cmakeargs="-DBUILD_SHARED_LIBS=1">
+    <branch repo="aomedia.googlesource.com"
+            module="aom"
+            checkoutdir="aom"
+            tag="v3.7.0" />
+  </cmake>
+
+  <autotools id="libsrtp">
+    <branch repo="github-tarball"
+            module="cisco/libsrtp/archive/v${version}.tar.gz"
+            checkoutdir="libsrtp-${version}"
+            version="2.2.0">
+      <patch file="libsrtp-Fix-building-with-gcc-10.patch" strip="1"/>
+    </branch>
+  </autotools>
+
+  <meson id="gstreamer" mesonargs="-Dintrospection=disabled -Dexamples=disabled -Dtests=disabled">
+    <dependencies>
+      <dep package="orc"/>
+    </dependencies>
+    <branch repo="gstreamer"
+            module="gstreamer/archive/refs/tags/${version}.tar.gz"
+            rename-tarball="gstreamer-${version}.tar.gz"
+            checkoutdir="gstreamer-${version}.tar.gz"
+            subdir="gstreamer-${version}.tar.gz"
+            version="1.18.4"
+            hash="sha256:f0956c2056281f5909d030945a9896810e55084f29b6bcfc401b53e91ddf1c7f" />
+  </meson>
+
+  <meson id="gst-plugins-base" mesonargs="-Dintrospection=disabled -Dexamples=disabled">
+    <if condition-set="wpe">
+      <autogenargs value="-Dpango=disabled"/>
+    </if>
+    <dependencies>
+      <dep package="gstreamer"/>
+    </dependencies>
+    <branch repo="gstreamer"
+            module="gst-plugins-base/archive/refs/tags/${version}.tar.gz"
+            rename-tarball="gst-plugins-base-${version}.tar.gz"
+            checkoutdir="gst-plugins-base-${version}.tar.gz"
+            version="1.18.4"
+            hash="sha256:7ade65d9a9c88a346954aeea3133ffba89d90da7534895f1a960b26fa496d4ca">
+      <patch file="gst-plugins-base-Fix-include-xdg-shell-client-protocol.diff" strip="1" />
+    </branch>
+  </meson>
+
+  <meson id="gst-plugins-good" mesonargs="-Dexamples=disabled -Dgtk3=disabled -Dqt5=disabled">
+    <dependencies>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+    <branch repo="gstreamer"
+            module="gst-plugins-good/archive/refs/tags/${version}.tar.gz"
+            rename-tarball="gst-plugins-good-${version}.tar.gz"
+            checkoutdir="gst-plugins-good-${version}.tar.gz"
+            version="1.18.4"
+            hash="sha256:66dc8eeb06070f1b0135c36110c91655ae34499f8172b36dae3c6499e52e302e" >
+    </branch>
+  </meson>
+
+  <meson id="gst-plugins-bad" mesonargs="-Dintrospection=disabled -Dexamples=disabled -Dopenexr=disabled -Dopencv=disabled">
+    <dependencies>
+      <dep package="graphene"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="openh264"/>
+      <dep package="aom"/>
+      <dep package="libsrtp"/>
+    </dependencies>
+    <branch repo="gstreamer"
+            module="gst-plugins-bad/archive/refs/tags/${version}.tar.gz"
+            rename-tarball="gst-plugins-bad-${version}.tar.gz"
+            checkoutdir="gst-plugins-bad-${version}.tar.gz"
+            version="1.18.4"
+            hash="sha256:30178ddcabcf71faccca8808f402a6e02394dfe3f821e2abe7a1b397f01eeaed" >
+    </branch>
+  </meson>
+
+  <autotools id="ffmpeg" autogen-template="%(srcdir)s/configure --prefix=%(prefix)s --enable-static --enable-pic --disable-avdevice --disable-postproc --disable-swscale --disable-programs --disable-ffplay --disable-ffprobe --disable-ffmpeg --disable-encoder=flac --disable-protocols --disable-devices --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau --disable-filters --enable-filter=yadif --disable-doc --disable-d3d11va --disable-dxva2 --disable-audiotoolbox --disable-videotoolbox --disable-vaapi --disable-crystalhd --disable-mediacodec --disable-nvenc --disable-mmal --disable-omx --disable-omx-rpi --disable-cuda --disable-cuvid --disable-libmfx --disable-libnpp --disable-iconv --disable-jni --disable-v4l2_m2m --enable-optimizations">
+    <branch repo="ffmpeg"
+            module="ffmpeg-${version}.tar.gz"
+            version="4.0.4"
+            hash="sha256:80bb685abfcdda7c9b6c9c5caf1d8dbb927858050d7377c2b8f3488c7e8a9b7f"/>
+  </autotools>
+
+  <meson id="gst-libav">
+    <dependencies>
+      <dep package="gst-plugins-base"/>
+      <dep package="ffmpeg"/>
+    </dependencies>
+    <branch repo="gstreamer"
+            module="gstreamer/archive/refs/tags/gst-libav-${version}.tar.gz"
+            rename-tarball="gst-libav-${version}.tar.gz"
+            checkoutdir="gst-libav-${version}.tar.gz"
+            version="1.18.4"
+            hash="sha256:ad3127fafe50834aa3416e172f7e5d11208ed2cc0f212b79f9c11e1c9691d18c" >
+    </branch>
+  </meson>
+
+
 </moduleset>