diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5320e81a48f2dbe9619b7ec81d51b1038a29858a..93149e357df41586949b118b252d7b1a7bdbd4cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v49"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v50"
 
 workflow:
   rules:
@@ -422,7 +422,7 @@ asan-build:
     - export PATH="$HOME/.local/bin:$PATH"
     - CC=clang meson setup
             --buildtype=debugoptimized
-            -Db_sanitize=address
+            -Db_sanitize=address,undefined
             -Db_lundef=false
             -Dbuild-demos=false
             -Dbuild-tests=false
diff --git a/.gitlab-ci/.fedora.Dockerfile.swp b/.gitlab-ci/.fedora.Dockerfile.swp
deleted file mode 100644
index 8dfbbcce6000e95b0c8793d90f7f7ea88737c82c..0000000000000000000000000000000000000000
Binary files a/.gitlab-ci/.fedora.Dockerfile.swp and /dev/null differ
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 4c1ae0bf45d8b9397ac4c6c77f3db10993726770..ccb67dc5ddff3f0ae31a22588db50a741126135b 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -2,8 +2,6 @@ FROM fedora:39
 
 RUN dnf -y install \
     adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
     avahi-gobject-devel \
     cairo-devel \
     cairo-gobject-devel \
@@ -18,7 +16,6 @@ RUN dnf -y install \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     diffutils \
-    docbook-style-xsl \
     elfutils-libelf-devel \
     expat-devel \
     fribidi-devel \
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index dd03cfc16cec7429e61d5bb771bc8f620aa1ddd4..8df3dad3b5e03d48bfb3853d9e5c1eaffd691668 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -11,7 +11,7 @@ multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 
 # Ignore memory leaks lower in dependencies
 export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
-export G_SLICE=always-malloc
+export UBSAN_OPTIONS=silence_unsigned_overflow=1
 
 case "${setup}" in
   x11*)
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index a6dbba121a6e03d6841e1017b7022f06d88cc67e..e330453c36d3ded5f9dbb384560cd5d148992d08 100644
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -290,7 +290,7 @@ gdk_gl_context_create_egl_context (GdkGLContext *context,
   GdkDisplay *display = gdk_gl_context_get_display (context);
   EGLDisplay egl_display = gdk_display_get_egl_display (display);
   GdkGLContext *share = gdk_display_get_gl_context (display);
-  GdkGLContextPrivate *share_priv = gdk_gl_context_get_instance_private (share);
+  GdkGLContextPrivate *share_priv = share ? gdk_gl_context_get_instance_private (share) : NULL;
   EGLConfig egl_config;
   EGLContext ctx;
   EGLint context_attribs[N_EGL_ATTRS], i = 0, flags = 0;
diff --git a/meson.build b/meson.build
index bf32c40fc25b10bc1e255cabce4465bf3bc0fa99..67d6331bab2fdb6e949913ee84b3467a688665cb 100644
--- a/meson.build
+++ b/meson.build
@@ -307,7 +307,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
 
   extra_warnings = [
     'address',
-    'array-bounds',
     'empty-body',
     'enum-int-mismatch',
     'implicit',
diff --git a/testsuite/tools/validate b/testsuite/tools/validate
index 414a5053b3d4ddddb655ab2cc8a82e114f31426a..35e3489f1e442d0a6a5de8d32384ab88b17f6906 100755
--- a/testsuite/tools/validate
+++ b/testsuite/tools/validate
@@ -4,6 +4,9 @@ GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk4-builder-tool}
 TEST_DATA_DIR=${G_TEST_SRCDIR:-.}/validate-data
 TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}/validate
 
+# https://gitlab.freedesktop.org/mesa/mesa/-/issues/10293
+export LIBGL_ALWAYS_SOFTWARE=true
+
 mkdir -p "$TEST_RESULT_DIR"
 
 shopt -s nullglob