diff --git a/apps.toml b/apps.toml
index ff5ffd19..01f4cc68 100644
--- a/apps.toml
+++ b/apps.toml
@@ -284,6 +284,12 @@ state = "working"
 subtags = [ "backup" ]
 url = "https://github.com/YunoHost-Apps/borgserver_ynh"
 
+[borgwarehouse]
+category = "system_tools"
+state = "working"
+subtags = [ "backup" ]
+url = "https://github.com/YunoHost-Apps/borgwarehouse_ynh"
+
 [bozon]
 antifeatures = [ "deprecated-software" ]
 category = "synchronization"
diff --git a/wishlist.toml b/wishlist.toml
index b944bc8e..2c8a1f1b 100644
--- a/wishlist.toml
+++ b/wishlist.toml
@@ -154,12 +154,6 @@ description = "Donate unused CPU time to help scientific projects (like World Co
 upstream = "https://github.com/BOINC/boinc"
 website = "https://boinc.berkeley.edu/"
 
-[borgwarehouse]
-name = "BorgWarehouse"
-description = "A fast and modern WebUI for a BorgBackup's central repository server"
-upstream = "https://github.com/ravinou/borgwarehouse"
-website = "https://borgwarehouse.com"
-
 [btcpay-server]
 name = "BTCPay Server"
 description = "Bitcoin payment processor"