diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml
index 00c209633a..52fff8ddde 100644
--- a/.gitlab-image-tags.yml
+++ b/.gitlab-image-tags.yml
@@ -9,7 +9,7 @@ variables:
 
   DEBIAN_TAG:  '2024-04-22.4'
 
-  INDENT_TAG: '2023-08-24.3'
+  INDENT_TAG: '2024-05-28.0'
 
   LINT_TAG: '2024-02-20.0'
 
diff --git a/ci/docker/indent/prepare.sh b/ci/docker/indent/prepare.sh
index a2849d355b..462e29f940 100755
--- a/ci/docker/indent/prepare.sh
+++ b/ci/docker/indent/prepare.sh
@@ -17,38 +17,21 @@ apt install -y dotnet-sdk-7.0
 dotnet tool install --global dotnet-format
 ln -s ~/.dotnet/tools/dotnet-format /usr/local/bin/dotnet-format
 
-# Patch indent for crasher bug on very long comments
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1036851
+# Build and install gst-indent-1.0
 echo "deb-src http://deb.debian.org/debian/ bookworm main" >> /etc/apt/sources.list
 apt update
-
-apt-get install --assume-yes devscripts build-essential dpkg-dev wget
-
+apt-get install --assume-yes devscripts build-essential dpkg-dev wget meson ninja-build
 apt-get build-dep --assume-yes indent
 
-apt-get source indent
+git clone https://gitlab.freedesktop.org/gstreamer/gst-indent.git
+cd gst-indent
 
-wget -O indent-2.2.12/debian/patches/9999-long-comment-crashfix.patch 'https://git.savannah.gnu.org/cgit/indent.git/patch/?id=02d7fd4c426e4acfa591a6738dec72f7303c1e7e'
-
-echo "9999-long-comment-crashfix.patch" >> indent-2.2.12/debian/patches/series
-
-cat >indent-2.2.12/debian/changelog.new <<-EOF
-indent (2.2.12-4gst1) unstable; urgency=medium
-
-  * Pull in bug-fix for crashes on comments longer than 1023 characters.
-    See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1036851
-
- -- Tim-Philipp Müller <tim@centricular.com>  Wed, 14 Jun 2023 12:30:00 +0100
-
-EOF
-cat indent-2.2.12/debian/changelog >> indent-2.2.12/debian/changelog.new
-mv indent-2.2.12/debian/changelog.new indent-2.2.12/debian/changelog
-
-cd indent-2.2.12 && dpkg-buildpackage -us -uc && dpkg -i ../indent_2.2.12-4gst1_amd64.deb
-
-wget -O gstbayer2rgb.c "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/raw/main/subprojects/gst-plugins-bad/gst/bayer/gstbayer2rgb.c?inline=false"
+meson setup --prefix=/usr _build
+meson install -C _build
 
 # Try it
+wget -O gstbayer2rgb.c "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/raw/main/subprojects/gst-plugins-bad/gst/bayer/gstbayer2rgb.c?inline=false"
+
 for i in 1 2; do
 indent \
   --braces-on-if-line \
@@ -68,8 +51,9 @@ indent \
 done;
 
 # clean up
-rm gstbayer2rgb.c
-rm -rf indent*
-apt-get remove --assume-yes devscripts build-essential dpkg-dev wget
+cd ..
+rm -rf gst-indent
+
+apt-get remove --assume-yes devscripts build-essential dpkg-dev wget meson ninja-build
 apt-get remove --assume-yes libtext-unidecode-perl  libxml-namespacesupport-perl  libxml-sax-base-perl  libxml-sax-perl  libxml-libxml-perl texinfo
 apt-get autoremove --assume-yes