diff --git a/gui-apps/yambar/metadata.xml b/gui-apps/yambar/metadata.xml
index ee61b7d339..8ab6a025c2 100644
--- a/gui-apps/yambar/metadata.xml
+++ b/gui-apps/yambar/metadata.xml
@@ -5,13 +5,10 @@
 		<email>leonardo@neumann.dev.br</email>
 		<name>Leonardo Neumann</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>julien@jroy.ca</email>
-		<name>Julien Roy</name>
-	</maintainer>
 	<upstream>
 		<bugs-to>https://codeberg.org/dnkl/yambar/issues</bugs-to>
 		<changelog>https://codeberg.org/dnkl/yambar/releases</changelog>
+		<remote-id type="codeberg">dnkl/yambar</remote-id>
 	</upstream>
 	<use>
 		<flag name="core">Compiles modules, particles and decorations as shared libraries, which are loaded on-demand</flag>
diff --git a/gui-apps/yambar/yambar-1.10.0.ebuild b/gui-apps/yambar/yambar-1.10.0.ebuild
index 8faf041d0e..13784e42c9 100644
--- a/gui-apps/yambar/yambar-1.10.0.ebuild
+++ b/gui-apps/yambar/yambar-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
 HOMEPAGE="https://codeberg.org/dnkl/yambar"
 LICENSE="MIT"
 SLOT="0"
-IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl +foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio +removables +river +script sway-xkb wayland X xkb xwindow"
+IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl +foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio +removables +river +script sway-xkb wayland +X xkb xwindow"
 REQUIRED_USE="
 	|| ( wayland X )
 	sway-xkb? ( wayland )
diff --git a/gui-apps/yambar/yambar-1.9.0.ebuild b/gui-apps/yambar/yambar-1.9.0.ebuild
index c1f9a1ff4f..904fe490fc 100644
--- a/gui-apps/yambar/yambar-1.9.0.ebuild
+++ b/gui-apps/yambar/yambar-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
 HOMEPAGE="https://codeberg.org/dnkl/yambar"
 LICENSE="MIT"
 SLOT="0"
-IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl +foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio +removables +river +script sway-xkb wayland X xkb xwindow"
+IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl +foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio +removables +river +script sway-xkb wayland +X xkb xwindow"
 REQUIRED_USE="
 	|| ( wayland X )
 	sway-xkb? ( wayland )