diff --git a/conf/app.src b/conf/app.src
index b12619a..d15dc8b 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,4 +1,4 @@
-SOURCE_URL=https://codeberg.org/zot/osada/archive/54a7f397b4fe6a3b3731a2e37c180d9f2a789756.tar.gz
+SOURCE_URL=https://codeberg.org/zot-archive/osada/archive/54a7f397b4fe6a3b3731a2e37c180d9f2a789756.tar.gz
 SOURCE_SUM=927e13e46c32a414fd9beec1a8a1f372778b611f8382add49481bb4664db9fad
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
diff --git a/conf/app_addons.src b/conf/app_addons.src
index ff5b073..0ab5da7 100755
--- a/conf/app_addons.src
+++ b/conf/app_addons.src
@@ -1,4 +1,4 @@
-SOURCE_URL=https://codeberg.org/zot/osada-addons/archive/2a39590048b3d93795918f20dc5170e9c2a4bcde.tar.gz
+SOURCE_URL=https://codeberg.org/zot-archive/osada-addons/archive/2a39590048b3d93795918f20dc5170e9c2a4bcde.tar.gz
 SOURCE_SUM=ba2c83145d98c2948a33eb3250bc29f3116c156f936ca56e7e3051e393804be4
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 9332df5..ac868d6 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,12 +4,10 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app
 YNH_PHP_VERSION="7.3"
 
-pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd"
-
 # dependencies used by the app
+pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd"
 pg_pkg_dependencies="postgresql postgresql-contrib"
 
 #=================================================