diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 956e834..d0bdf16 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -1,6 +1,6 @@
 # This file is generated automatically when running './update.sh'
 # Please do not edit it directly!
-# Instead perform any modifications in .github/build.yml.template
+# Instead perform any modifications in .gitea/build.yml.template
 
 name: build
 permissions:
@@ -31,6 +31,7 @@ jobs:
       - env:
           DOCKER_BUILD: 1
           DOCKER_PUSH: 1
+	  DOCKER_NAMESPACE: "wavyzz"
         run: |
           ./update.sh ${{ matrix.dolibarr_version }}
 
diff --git a/images/15.0.3-php7.4/Dockerfile b/images/15.0.3-php7.4/Dockerfile
index 4248735..0b417ea 100644
--- a/images/15.0.3-php7.4/Dockerfile
+++ b/images/15.0.3-php7.4/Dockerfile
@@ -17,6 +17,8 @@ ENV DOLI_VERSION=15.0.3
 ENV DOLI_VERSION_FOR_INIT_DEMO=15.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+ENV DOLI_GIT_BASE_URL=https://gitea.wavyzz.com/Wavyzz/dolibarr-fork
+ENV DOLI_ARCHIVE_BASE_DIR=dolibarr-fork
 
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
@@ -93,11 +95,11 @@ RUN a2disconf serve-cgi-bin \
     && a2dismod -f autoindex
 
 # Get Dolibarr
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+RUN curl -fLSs ${DOLI_GIT_BASE_URL}/archive/${DOLI_VERSION}.tar.gz |\
     tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/htdocs/* /var/www/html/ && \
     ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/scripts /var/www/ && \
     rm -rf /tmp/* && \
     mkdir -p /var/www/documents && \
     mkdir -p /var/www/html/custom && \
diff --git a/images/16.0.5-php8.1/Dockerfile b/images/16.0.5-php8.1/Dockerfile
index 6cea032..997c5ee 100644
--- a/images/16.0.5-php8.1/Dockerfile
+++ b/images/16.0.5-php8.1/Dockerfile
@@ -17,6 +17,8 @@ ENV DOLI_VERSION=16.0.5
 ENV DOLI_VERSION_FOR_INIT_DEMO=16.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+ENV DOLI_GIT_BASE_URL=https://gitea.wavyzz.com/Wavyzz/dolibarr-fork
+ENV DOLI_ARCHIVE_BASE_DIR=dolibarr-fork
 
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
@@ -93,11 +95,11 @@ RUN a2disconf serve-cgi-bin \
     && a2dismod -f autoindex
 
 # Get Dolibarr
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+RUN curl -fLSs ${DOLI_GIT_BASE_URL}/archive/${DOLI_VERSION}.tar.gz |\
     tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/htdocs/* /var/www/html/ && \
     ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/scripts /var/www/ && \
     rm -rf /tmp/* && \
     mkdir -p /var/www/documents && \
     mkdir -p /var/www/html/custom && \
diff --git a/images/17.0.4-php8.1/Dockerfile b/images/17.0.4-php8.1/Dockerfile
index 2b3e566..bc18248 100644
--- a/images/17.0.4-php8.1/Dockerfile
+++ b/images/17.0.4-php8.1/Dockerfile
@@ -17,6 +17,8 @@ ENV DOLI_VERSION=17.0.4
 ENV DOLI_VERSION_FOR_INIT_DEMO=17.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+ENV DOLI_GIT_BASE_URL=https://gitea.wavyzz.com/Wavyzz/dolibarr-fork
+ENV DOLI_ARCHIVE_BASE_DIR=dolibarr-fork
 
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
@@ -93,11 +95,11 @@ RUN a2disconf serve-cgi-bin \
     && a2dismod -f autoindex
 
 # Get Dolibarr
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+RUN curl -fLSs ${DOLI_GIT_BASE_URL}/archive/${DOLI_VERSION}.tar.gz |\
     tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/htdocs/* /var/www/html/ && \
     ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/scripts /var/www/ && \
     rm -rf /tmp/* && \
     mkdir -p /var/www/documents && \
     mkdir -p /var/www/html/custom && \
diff --git a/images/18.0.8-php8.1/Dockerfile b/images/18.0.8-php8.1/Dockerfile
index 5816092..6341429 100644
--- a/images/18.0.8-php8.1/Dockerfile
+++ b/images/18.0.8-php8.1/Dockerfile
@@ -17,6 +17,8 @@ ENV DOLI_VERSION=18.0.8
 ENV DOLI_VERSION_FOR_INIT_DEMO=18.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+ENV DOLI_GIT_BASE_URL=https://gitea.wavyzz.com/Wavyzz/dolibarr-fork
+ENV DOLI_ARCHIVE_BASE_DIR=dolibarr-fork
 
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
@@ -93,11 +95,11 @@ RUN a2disconf serve-cgi-bin \
     && a2dismod -f autoindex
 
 # Get Dolibarr
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+RUN curl -fLSs ${DOLI_GIT_BASE_URL}/archive/${DOLI_VERSION}.tar.gz |\
     tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/htdocs/* /var/www/html/ && \
     ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/scripts /var/www/ && \
     rm -rf /tmp/* && \
     mkdir -p /var/www/documents && \
     mkdir -p /var/www/html/custom && \
diff --git a/images/19.0.4-php8.2/Dockerfile b/images/19.0.4-php8.2/Dockerfile
index f1da402..092443b 100644
--- a/images/19.0.4-php8.2/Dockerfile
+++ b/images/19.0.4-php8.2/Dockerfile
@@ -17,6 +17,8 @@ ENV DOLI_VERSION=19.0.4
 ENV DOLI_VERSION_FOR_INIT_DEMO=19.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+ENV DOLI_GIT_BASE_URL=https://gitea.wavyzz.com/Wavyzz/dolibarr-fork
+ENV DOLI_ARCHIVE_BASE_DIR=dolibarr-fork
 
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
@@ -93,11 +95,11 @@ RUN a2disconf serve-cgi-bin \
     && a2dismod -f autoindex
 
 # Get Dolibarr
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+RUN curl -fLSs ${DOLI_GIT_BASE_URL}/archive/${DOLI_VERSION}.tar.gz |\
     tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/htdocs/* /var/www/html/ && \
     ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/scripts /var/www/ && \
     rm -rf /tmp/* && \
     mkdir -p /var/www/documents && \
     mkdir -p /var/www/html/custom && \
diff --git a/images/20.0.4-php8.2/Dockerfile b/images/20.0.4-php8.2/Dockerfile
index a848a90..25f283c 100644
--- a/images/20.0.4-php8.2/Dockerfile
+++ b/images/20.0.4-php8.2/Dockerfile
@@ -17,6 +17,8 @@ ENV DOLI_VERSION=20.0.4
 ENV DOLI_VERSION_FOR_INIT_DEMO=20.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+ENV DOLI_GIT_BASE_URL=https://gitea.wavyzz.com/Wavyzz/dolibarr-fork
+ENV DOLI_ARCHIVE_BASE_DIR=dolibarr-fork
 
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
@@ -93,11 +95,11 @@ RUN a2disconf serve-cgi-bin \
     && a2dismod -f autoindex
 
 # Get Dolibarr
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+RUN curl -fLSs ${DOLI_GIT_BASE_URL}/archive/${DOLI_VERSION}.tar.gz |\
     tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/htdocs/* /var/www/html/ && \
     ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/scripts /var/www/ && \
     rm -rf /tmp/* && \
     mkdir -p /var/www/documents && \
     mkdir -p /var/www/html/custom && \
diff --git a/images/21.0.4-php8.2/Dockerfile b/images/21.0.4-php8.2/Dockerfile
index fccf043..22e995f 100644
--- a/images/21.0.4-php8.2/Dockerfile
+++ b/images/21.0.4-php8.2/Dockerfile
@@ -17,6 +17,8 @@ ENV DOLI_VERSION=21.0.4
 ENV DOLI_VERSION_FOR_INIT_DEMO=21.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+ENV DOLI_GIT_BASE_URL=https://gitea.wavyzz.com/Wavyzz/dolibarr-fork
+ENV DOLI_ARCHIVE_BASE_DIR=dolibarr-fork
 
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
@@ -93,11 +95,11 @@ RUN a2disconf serve-cgi-bin \
     && a2dismod -f autoindex
 
 # Get Dolibarr
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+RUN curl -fLSs ${DOLI_GIT_BASE_URL}/archive/${DOLI_VERSION}.tar.gz |\
     tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/htdocs/* /var/www/html/ && \
     ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/scripts /var/www/ && \
     rm -rf /tmp/* && \
     mkdir -p /var/www/documents && \
     mkdir -p /var/www/html/custom && \
diff --git a/images/22.0.2-php8.2/Dockerfile b/images/22.0.2-php8.2/Dockerfile
index 89d5c05..5c3c909 100644
--- a/images/22.0.2-php8.2/Dockerfile
+++ b/images/22.0.2-php8.2/Dockerfile
@@ -17,6 +17,8 @@ ENV DOLI_VERSION=22.0.2
 ENV DOLI_VERSION_FOR_INIT_DEMO=22.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+ENV DOLI_GIT_BASE_URL=https://gitea.wavyzz.com/Wavyzz/dolibarr-fork
+ENV DOLI_ARCHIVE_BASE_DIR=dolibarr-fork
 
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
@@ -93,11 +95,11 @@ RUN a2disconf serve-cgi-bin \
     && a2dismod -f autoindex
 
 # Get Dolibarr
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+RUN curl -fLSs ${DOLI_GIT_BASE_URL}/archive/${DOLI_VERSION}.tar.gz |\
     tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/htdocs/* /var/www/html/ && \
     ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/scripts /var/www/ && \
     rm -rf /tmp/* && \
     mkdir -p /var/www/documents && \
     mkdir -p /var/www/html/custom && \
diff --git a/images/develop/Dockerfile b/images/develop/Dockerfile
index 78fe8ac..28f9080 100644
--- a/images/develop/Dockerfile
+++ b/images/develop/Dockerfile
@@ -17,6 +17,8 @@ ENV DOLI_VERSION=develop
 ENV DOLI_VERSION_FOR_INIT_DEMO=22.0
 ENV DOLI_INSTALL_AUTO=1
 ENV DOLI_PROD=1
+ENV DOLI_GIT_BASE_URL=https://gitea.wavyzz.com/Wavyzz/dolibarr-fork
+ENV DOLI_ARCHIVE_BASE_DIR=dolibarr-fork
 
 ENV DOLI_DB_TYPE=mysqli
 ENV DOLI_DB_HOST=mysql
@@ -93,11 +95,11 @@ RUN a2disconf serve-cgi-bin \
     && a2dismod -f autoindex
 
 # Get Dolibarr
-RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\
+RUN curl -fLSs ${DOLI_GIT_BASE_URL}/archive/${DOLI_VERSION}.tar.gz |\
     tar -C /tmp -xz && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/htdocs/* /var/www/html/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/htdocs/* /var/www/html/ && \
     ln -s /var/www/html /var/www/htdocs && \
-    cp -r /tmp/dolibarr-${DOLI_VERSION}/scripts /var/www/ && \
+    cp -r /tmp/${DOLI_ARCHIVE_BASE_DIR}/scripts /var/www/ && \
     rm -rf /tmp/* && \
     mkdir -p /var/www/documents && \
     mkdir -p /var/www/html/custom && \