diff --git a/gstreamer-app/Gir.toml b/gstreamer-app/Gir.toml
index 703a810be..285140fcf 100644
--- a/gstreamer-app/Gir.toml
+++ b/gstreamer-app/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstApp"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-app/sys/Gir.toml b/gstreamer-app/sys/Gir.toml
index 5f249df0d..8107a99ef 100644
--- a/gstreamer-app/sys/Gir.toml
+++ b/gstreamer-app/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstApp"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-audio/Gir.toml b/gstreamer-audio/Gir.toml
index fe4c503f4..b73727327 100644
--- a/gstreamer-audio/Gir.toml
+++ b/gstreamer-audio/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstAudio"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-audio/sys/Gir.toml b/gstreamer-audio/sys/Gir.toml
index 05ecec4e4..4909addd4 100644
--- a/gstreamer-audio/sys/Gir.toml
+++ b/gstreamer-audio/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstAudio"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-base/Gir.toml b/gstreamer-base/Gir.toml
index e5deb0b8f..4c678b425 100644
--- a/gstreamer-base/Gir.toml
+++ b/gstreamer-base/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstBase"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-base/sys/Gir.toml b/gstreamer-base/sys/Gir.toml
index 074cf4ddf..48476936b 100644
--- a/gstreamer-base/sys/Gir.toml
+++ b/gstreamer-base/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstBase"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-check/Gir.toml b/gstreamer-check/Gir.toml
index e6d170cc9..f61f9d3b7 100644
--- a/gstreamer-check/Gir.toml
+++ b/gstreamer-check/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstCheck"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-check/sys/Gir.toml b/gstreamer-check/sys/Gir.toml
index e72df8f0b..1f68e6273 100644
--- a/gstreamer-check/sys/Gir.toml
+++ b/gstreamer-check/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstCheck"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-controller/Gir.toml b/gstreamer-controller/Gir.toml
index e64683d6c..7f916bec4 100644
--- a/gstreamer-controller/Gir.toml
+++ b/gstreamer-controller/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstController"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-controller/sys/Gir.toml b/gstreamer-controller/sys/Gir.toml
index 104c2f2d7..6a2b11733 100644
--- a/gstreamer-controller/sys/Gir.toml
+++ b/gstreamer-controller/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstController"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-editing-services/Gir.toml b/gstreamer-editing-services/Gir.toml
index 5a360b7c3..f7131ddef 100644
--- a/gstreamer-editing-services/Gir.toml
+++ b/gstreamer-editing-services/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GES"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-editing-services/sys/Gir.toml b/gstreamer-editing-services/sys/Gir.toml
index 26af20a87..eed591891 100644
--- a/gstreamer-editing-services/sys/Gir.toml
+++ b/gstreamer-editing-services/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GES"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-gl/Gir.toml b/gstreamer-gl/Gir.toml
index a936c7c97..b53da8406 100644
--- a/gstreamer-gl/Gir.toml
+++ b/gstreamer-gl/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstGL"
 version = "1.0"
 min_cfg_version = "1.14"
diff --git a/gstreamer-gl/egl/Gir.toml b/gstreamer-gl/egl/Gir.toml
index 0b1575bc7..632e66c5f 100644
--- a/gstreamer-gl/egl/Gir.toml
+++ b/gstreamer-gl/egl/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstGLEGL"
 version = "1.0"
 min_cfg_version = "1.14"
diff --git a/gstreamer-gl/egl/sys/Gir.toml b/gstreamer-gl/egl/sys/Gir.toml
index 47ff53420..232f646c9 100644
--- a/gstreamer-gl/egl/sys/Gir.toml
+++ b/gstreamer-gl/egl/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../../gir-files"
+girs_directories = ["../../../gir-files", "../../../gst-gir-files"]
 library = "GstGLEGL"
 min_cfg_version = "1.14"
 version = "1.0"
diff --git a/gstreamer-gl/sys/Gir.toml b/gstreamer-gl/sys/Gir.toml
index c11849180..7ae0c7c09 100644
--- a/gstreamer-gl/sys/Gir.toml
+++ b/gstreamer-gl/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstGL"
 version = "1.0"
 min_cfg_version = "1.14"
diff --git a/gstreamer-gl/wayland/Gir.toml b/gstreamer-gl/wayland/Gir.toml
index 38da7ce0e..513b0caa7 100644
--- a/gstreamer-gl/wayland/Gir.toml
+++ b/gstreamer-gl/wayland/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstGLWayland"
 version = "1.0"
 min_cfg_version = "1.14"
diff --git a/gstreamer-gl/wayland/sys/Gir.toml b/gstreamer-gl/wayland/sys/Gir.toml
index 497d69967..33c960d7e 100644
--- a/gstreamer-gl/wayland/sys/Gir.toml
+++ b/gstreamer-gl/wayland/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../../gir-files"
+girs_directories = ["../../../gir-files", "../../../gst-gir-files"]
 library = "GstGLWayland"
 min_cfg_version = "1.14"
 version = "1.0"
diff --git a/gstreamer-gl/x11/Gir.toml b/gstreamer-gl/x11/Gir.toml
index 1c1725fa5..7c7fca147 100644
--- a/gstreamer-gl/x11/Gir.toml
+++ b/gstreamer-gl/x11/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstGLX11"
 version = "1.0"
 min_cfg_version = "1.14"
diff --git a/gstreamer-gl/x11/sys/Gir.toml b/gstreamer-gl/x11/sys/Gir.toml
index 2819f54cc..91e31252b 100644
--- a/gstreamer-gl/x11/sys/Gir.toml
+++ b/gstreamer-gl/x11/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../../gir-files"
+girs_directories = ["../../../gir-files", "../../../gst-gir-files"]
 library = "GstGLX11"
 min_cfg_version = "1.14"
 version = "1.0"
diff --git a/gstreamer-mpegts/sys/Gir.toml b/gstreamer-mpegts/sys/Gir.toml
index 7be14ce9e..7cf90657e 100644
--- a/gstreamer-mpegts/sys/Gir.toml
+++ b/gstreamer-mpegts/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstMpegts"
 version = "1.0"
 min_cfg_version = "1.12"
diff --git a/gstreamer-net/Gir.toml b/gstreamer-net/Gir.toml
index 4e4180433..7adfd1425 100644
--- a/gstreamer-net/Gir.toml
+++ b/gstreamer-net/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstNet"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-net/sys/Gir.toml b/gstreamer-net/sys/Gir.toml
index e5ae6986b..e18a7fe0e 100644
--- a/gstreamer-net/sys/Gir.toml
+++ b/gstreamer-net/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstNet"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-pbutils/Gir.toml b/gstreamer-pbutils/Gir.toml
index b19c5b20b..595aca5ff 100644
--- a/gstreamer-pbutils/Gir.toml
+++ b/gstreamer-pbutils/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstPbutils"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-pbutils/sys/Gir.toml b/gstreamer-pbutils/sys/Gir.toml
index 86c9c14b3..2d5fa4c43 100644
--- a/gstreamer-pbutils/sys/Gir.toml
+++ b/gstreamer-pbutils/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstPbutils"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-player/Gir.toml b/gstreamer-player/Gir.toml
index 39d5bb5e6..e153c7ba9 100644
--- a/gstreamer-player/Gir.toml
+++ b/gstreamer-player/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstPlayer"
 version = "1.0"
 min_cfg_version = "1.12"
diff --git a/gstreamer-player/sys/Gir.toml b/gstreamer-player/sys/Gir.toml
index 72fb67980..8395ac4ac 100644
--- a/gstreamer-player/sys/Gir.toml
+++ b/gstreamer-player/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstPlayer"
 version = "1.0"
 min_cfg_version = "1.12"
diff --git a/gstreamer-rtp/Gir.toml b/gstreamer-rtp/Gir.toml
index 78b0e4b56..cf50bbc2d 100644
--- a/gstreamer-rtp/Gir.toml
+++ b/gstreamer-rtp/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstRtp"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-rtp/sys/Gir.toml b/gstreamer-rtp/sys/Gir.toml
index 1a023464e..08f884bf5 100644
--- a/gstreamer-rtp/sys/Gir.toml
+++ b/gstreamer-rtp/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstRtp"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-rtsp-server/Gir.toml b/gstreamer-rtsp-server/Gir.toml
index 259998b48..22e56072d 100644
--- a/gstreamer-rtsp-server/Gir.toml
+++ b/gstreamer-rtsp-server/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstRtspServer"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-rtsp-server/sys/Gir.toml b/gstreamer-rtsp-server/sys/Gir.toml
index 1f46561ba..d832a2b3b 100644
--- a/gstreamer-rtsp-server/sys/Gir.toml
+++ b/gstreamer-rtsp-server/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstRtspServer"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-rtsp/Gir.toml b/gstreamer-rtsp/Gir.toml
index 15314944d..2d5d8c6a0 100644
--- a/gstreamer-rtsp/Gir.toml
+++ b/gstreamer-rtsp/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstRtsp"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-rtsp/sys/Gir.toml b/gstreamer-rtsp/sys/Gir.toml
index 3d86d38b5..49db0c45d 100644
--- a/gstreamer-rtsp/sys/Gir.toml
+++ b/gstreamer-rtsp/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstRtsp"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-sdp/Gir.toml b/gstreamer-sdp/Gir.toml
index aff2d715e..62253d6db 100644
--- a/gstreamer-sdp/Gir.toml
+++ b/gstreamer-sdp/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstSdp"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-sdp/sys/Gir.toml b/gstreamer-sdp/sys/Gir.toml
index 29541b0e8..ab36d82c5 100644
--- a/gstreamer-sdp/sys/Gir.toml
+++ b/gstreamer-sdp/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstSdp"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-tag/sys/Gir.toml b/gstreamer-tag/sys/Gir.toml
index 8a1c07e9a..716e5ed30 100644
--- a/gstreamer-tag/sys/Gir.toml
+++ b/gstreamer-tag/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstTag"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-video/Gir.toml b/gstreamer-video/Gir.toml
index 43b28e626..e351d222f 100644
--- a/gstreamer-video/Gir.toml
+++ b/gstreamer-video/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstVideo"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-video/sys/Gir.toml b/gstreamer-video/sys/Gir.toml
index 74a1281a0..1b86cce41 100644
--- a/gstreamer-video/sys/Gir.toml
+++ b/gstreamer-video/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstVideo"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer-webrtc/Gir.toml b/gstreamer-webrtc/Gir.toml
index 8493066f8..cb5b9d7d1 100644
--- a/gstreamer-webrtc/Gir.toml
+++ b/gstreamer-webrtc/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "GstWebRTC"
 version = "1.0"
 min_cfg_version = "1.14"
diff --git a/gstreamer-webrtc/sys/Gir.toml b/gstreamer-webrtc/sys/Gir.toml
index e134ba1a3..67418c1ae 100644
--- a/gstreamer-webrtc/sys/Gir.toml
+++ b/gstreamer-webrtc/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "GstWebRTC"
 version = "1.0"
 min_cfg_version = "1.14"
diff --git a/gstreamer/Gir.toml b/gstreamer/Gir.toml
index 8c66e76eb..28c291506 100644
--- a/gstreamer/Gir.toml
+++ b/gstreamer/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../gir-files"
+girs_directories = ["../gir-files", "../gst-gir-files"]
 library = "Gst"
 version = "1.0"
 min_cfg_version = "1.8"
diff --git a/gstreamer/sys/Gir.toml b/gstreamer/sys/Gir.toml
index eb8c38636..539d8ad5b 100644
--- a/gstreamer/sys/Gir.toml
+++ b/gstreamer/sys/Gir.toml
@@ -1,5 +1,5 @@
 [options]
-girs_dir = "../../gir-files"
+girs_directories = ["../../gir-files", "../../gst-gir-files"]
 library = "Gst"
 version = "1.0"
 min_cfg_version = "1.8"