diff --git a/install_yunohost b/install_yunohost
index 76cc7bb..c49d15c 100755
--- a/install_yunohost
+++ b/install_yunohost
@@ -294,8 +294,7 @@ function setup_package_source() {
 
     # Debian repository
 
-    # FIXME : move "vinaigrette." to "repo." at some point...
-    local CUSTOMDEB="deb http://vinaigrette.yunohost.org/debian/ stretch stable testing unstable"
+    local CUSTOMDEB="deb http://forge.yunohost.org/debian/ stretch stable testing unstable"
 
     if [[ "$DISTRIB" == "stable" ]] ; then
         echo "$CUSTOMDEB" > $CUSTOMAPT
@@ -306,8 +305,7 @@ function setup_package_source() {
     fi
 
     # Add YunoHost repository key to the keyring
-    # FIXME : move "vinaigrette." to "repo." at some point...
-    wget -O- https://vinaigrette.yunohost.org/yunohost.asc -q | apt-key add -qq - >/dev/null 2>&1
+    wget -O- https://forge.yunohost.org/yunohost.asc -q | apt-key add -qq - >/dev/null 2>&1
 }
 
 function register_debconf() {