diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-9999-r1.ebuild
index ae7d26950f396..2dfac78c8749c 100644
--- a/gui-wm/dwl/dwl-9999-r1.ebuild
+++ b/gui-wm/dwl/dwl-9999-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == *9999* ]]; then
 			;;
 	esac
 else
-	SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.gh.tar.gz"
+	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 	KEYWORDS="~amd64 ~x86"
 fi
diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild
index 1bd355e65ad2d..f54f723105224 100644
--- a/gui-wm/dwl/dwl-9999.ebuild
+++ b/gui-wm/dwl/dwl-9999.ebuild
@@ -8,7 +8,7 @@ inherit savedconfig toolchain-funcs
 MY_P="${PN}-v${PV}"
 WLROOTS_SLOT="0/17"
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/djpohly/dwl"
+	EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
 	inherit git-r3
 
 	# 9999-r0: main (latest stable wlroots release)
@@ -23,13 +23,13 @@ if [[ ${PV} == *9999* ]]; then
 			;;
 	esac
 else
-	SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.gh.tar.gz"
+	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="dwm for Wayland"
-HOMEPAGE="https://github.com/djpohly/dwl"
+HOMEPAGE="https://codeberg.org/dwl/dwl"
 
 LICENSE="CC0-1.0 GPL-3+ MIT"
 SLOT="0"
diff --git a/gui-wm/dwl/metadata.xml b/gui-wm/dwl/metadata.xml
index 4ebf54b3ad36b..3d26f0e133bfe 100644
--- a/gui-wm/dwl/metadata.xml
+++ b/gui-wm/dwl/metadata.xml
@@ -10,7 +10,4 @@
       <email>proxy-maint@gentoo.org</email>
       <name>Proxy Maintainers</name>
     </maintainer>
-    <upstream>
-        <remote-id type="github">djpohly/dwl</remote-id>
-    </upstream>
 </pkgmetadata>