diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index af3abead53bda..b94fb943187c0 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -87,3 +87,4 @@ slotmove kde-apps/kdepim-meta 5 0
 slotmove kde-apps/kdesdk-meta 5 0
 slotmove kde-apps/kdeutils-meta 5 0
 move media-libs/oneVPL media-libs/libvpl
+move sys-auth/AusweisApp2 sys-auth/AusweisApp
diff --git a/sys-auth/AusweisApp2/AusweisApp2-2.0.3.ebuild b/sys-auth/AusweisApp/AusweisApp-2.0.3.ebuild
similarity index 96%
rename from sys-auth/AusweisApp2/AusweisApp2-2.0.3.ebuild
rename to sys-auth/AusweisApp/AusweisApp-2.0.3.ebuild
index a55a7e86cf8ba..f791a20ba1075 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-2.0.3.ebuild
+++ b/sys-auth/AusweisApp/AusweisApp-2.0.3.ebuild
@@ -8,7 +8,6 @@ inherit cmake xdg-utils
 DESCRIPTION="Official authentication app for German ID cards and residence permits"
 HOMEPAGE="https://www.ausweisapp.bund.de/"
 SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN/2/}-${PV}"
 
 LICENSE="EUPL-1.2"
 SLOT="0"
diff --git a/sys-auth/AusweisApp2/AusweisApp2-2.1.0.ebuild b/sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild
similarity index 96%
rename from sys-auth/AusweisApp2/AusweisApp2-2.1.0.ebuild
rename to sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild
index db9d5db3e6bb0..d86746427953b 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-2.1.0.ebuild
+++ b/sys-auth/AusweisApp/AusweisApp-2.1.0.ebuild
@@ -8,7 +8,6 @@ inherit cmake xdg-utils
 DESCRIPTION="Official authentication app for German ID cards and residence permits"
 HOMEPAGE="https://www.ausweisapp.bund.de/"
 SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN/2/}-${PV}"
 
 LICENSE="EUPL-1.2"
 SLOT="0"
diff --git a/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild b/sys-auth/AusweisApp/AusweisApp-9999.ebuild
similarity index 88%
rename from sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
rename to sys-auth/AusweisApp/AusweisApp-9999.ebuild
index 764e968e501be..2ee0eb3209a0d 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
+++ b/sys-auth/AusweisApp/AusweisApp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit cmake git-r3 xdg-utils
 
 DESCRIPTION="Official authentication app for German ID cards and residence permits"
 HOMEPAGE="https://www.ausweisapp.bund.de/"
-EGIT_REPO_URI="https://github.com/Governikus/AusweisApp2.git"
+EGIT_REPO_URI="https://github.com/Governikus/AusweisApp.git"
 
 LICENSE="EUPL-1.2"
 SLOT="0"
diff --git a/sys-auth/AusweisApp/Manifest b/sys-auth/AusweisApp/Manifest
new file mode 100644
index 0000000000000..bb557a4dc39fe
--- /dev/null
+++ b/sys-auth/AusweisApp/Manifest
@@ -0,0 +1,2 @@
+DIST AusweisApp-2.0.3.tar.gz 9125557 BLAKE2B 6d32e0d451259bfb44ac99dce9dee3e66afd07d5c78c8f033703213888fb68c5d3ee9f8374d1ab79cd364061e78d98ce0c21fc5d6957f601bd88e5e3e6b2489d SHA512 4f492d137c1f38d3ff5ae70afc28d44bd86ce2034166e8ea7ca44e91161301a739ddcf985c76b14147485f6bc4e30e316db50db86eda7e2de1b7344c37091cd4
+DIST AusweisApp-2.1.0.tar.gz 5876657 BLAKE2B 54c8676dda53a667104f8edf8fc70fc4ca736b1207bea0ce2a5fc0a628216ce4f001adac03308fceccbb8ad834d171f364ac6b4e948ada26d6983ede827fd10e SHA512 a7186bdfe3ebd6779588dc6fa219fcc2f60d36c62a8b9956bbdc86e4962120e46b39266e7207cf0de4d84f9212d1616bbec9f8901cb0a112bcfcae1684f3ff75
diff --git a/sys-auth/AusweisApp2/metadata.xml b/sys-auth/AusweisApp/metadata.xml
similarity index 81%
rename from sys-auth/AusweisApp2/metadata.xml
rename to sys-auth/AusweisApp/metadata.xml
index fe6904054d49f..2b138ddc526e3 100644
--- a/sys-auth/AusweisApp2/metadata.xml
+++ b/sys-auth/AusweisApp/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">Governikus/AusweisApp2</remote-id>
+		<remote-id type="github">Governikus/AusweisApp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
deleted file mode 100644
index 332db017f1c0b..0000000000000
--- a/sys-auth/AusweisApp2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST AusweisApp2-2.0.3.tar.gz 9125557 BLAKE2B 6d32e0d451259bfb44ac99dce9dee3e66afd07d5c78c8f033703213888fb68c5d3ee9f8374d1ab79cd364061e78d98ce0c21fc5d6957f601bd88e5e3e6b2489d SHA512 4f492d137c1f38d3ff5ae70afc28d44bd86ce2034166e8ea7ca44e91161301a739ddcf985c76b14147485f6bc4e30e316db50db86eda7e2de1b7344c37091cd4
-DIST AusweisApp2-2.1.0.tar.gz 5876657 BLAKE2B 54c8676dda53a667104f8edf8fc70fc4ca736b1207bea0ce2a5fc0a628216ce4f001adac03308fceccbb8ad834d171f364ac6b4e948ada26d6983ede827fd10e SHA512 a7186bdfe3ebd6779588dc6fa219fcc2f60d36c62a8b9956bbdc86e4962120e46b39266e7207cf0de4d84f9212d1616bbec9f8901cb0a112bcfcae1684f3ff75