diff --git a/application/remote-access-client/build.gradle b/application/remote-access-client/build.gradle
index b39ecc5d5..bcfb43fb5 100644
--- a/application/remote-access-client/build.gradle
+++ b/application/remote-access-client/build.gradle
@@ -61,7 +61,7 @@ android {
     }
 
     task webCopy(type: Copy) {
-        from '../../remoteaccess/dist'
+        from 'remoteaccess/dist'
         into 'assets/dist'
     }
 
@@ -89,10 +89,10 @@ preBuild.dependsOn(webCopy)
 def remoteAccessVersion() {
     def code = new ByteArrayOutputStream()
     try {
-        if (file("../../remoteaccess/package.json").exists()) {
+        if (file("remoteaccess/package.json").exists()) {
 
             exec {
-                commandLine = ['bash', '-c', 'grep -m1 "version" ../../remoteaccess/package.json']
+                commandLine = ['bash', '-c', 'grep -m1 "version" remoteaccess/package.json']
                 standardOutput = code
             }
             return code.toString().split("\"")[3]
@@ -107,7 +107,7 @@ def remoteAccessRevision() {
     try {
         def hash = new ByteArrayOutputStream()
         exec {
-            commandLine = ['bash', '-c', 'git -C ../../remoteaccess rev-parse --short HEAD']
+            commandLine = ['bash', '-c', 'git -C remoteaccess rev-parse --short HEAD']
             standardOutput = hash
         }
         return hash.toString()
diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh
index c7b006efe..cb09402a4 100755
--- a/buildsystem/compile-remoteaccess.sh
+++ b/buildsystem/compile-remoteaccess.sh
@@ -60,22 +60,23 @@ done
   REMOTE_ACCESS_TESTED_HASH=543dcf36610e6944c85cbf355b4b934b8ae451d3
   REMOTE_ACCESS_REPOSITORY=https://code.videolan.org/videolan/remoteaccess
 
-  : ${VLC_REMOTE_ACCESS_PATH:="$(pwd -P)/remoteaccess"}
+  : ${VLC_REMOTE_ACCESS_PATH:="$(pwd -P)/application/remote-access-client/remoteaccess"}
+  diagnostic "VLC_REMOTE_ACCESS_PATH is $VLC_REMOTE_ACCESS_PATH"
 
   if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ] || [ ! -d "$VLC_REMOTE_ACCESS_PATH/.git" ]; then
       diagnostic "Remote access sources: not found, cloning"
       branch="main"
       if [ ! -d "$VLC_REMOTE_ACCESS_PATH" ]; then
-          git clone --single-branch --branch ${branch} "${REMOTE_ACCESS_REPOSITORY}"
-          cd remoteaccess
+          git clone --single-branch --branch ${branch} "${REMOTE_ACCESS_REPOSITORY}" application/remote-access-client/remoteaccess
+          cd application/remote-access-client/remoteaccess
       else # folder exist with only the artifacts
-          cd remoteaccess
+          cd application/remote-access-client/remoteaccess
           git init
           git remote add origin "${REMOTE_ACCESS_REPOSITORY}"
           git pull origin ${branch}
       fi
       git reset --hard ${REMOTE_ACCESS_TESTED_HASH} || fail "Remote access sources: REMOTE_ACCESS_TESTED_HASH ${REMOTE_ACCESS_TESTED_HASH} not found"
-      cd ..
+      cd ../../..
   fi
 
   if [ "$INIT_ONLY" != 1 ]; then
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 9f0fb4712..8f9a48611 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
   VLC_ANDROID_IMAGE_30: registry.videolan.org/vlc-debian-android-3.0:20230621085943
   VLC_ANDROID_IMAGE_40: registry.videolan.org/vlc-debian-android:20240731083648
   VLC_WEB_BUILD_IMAGE: registry.videolan.org/videolan-alpine-node:20230523124511
-  WEBSERVER_DIR: "./remoteaccess"
+  WEBSERVER_DIR: "./application/remote-access-client/remoteaccess"
 
 default:
   before_script: |
@@ -53,7 +53,7 @@ webserver-install-dependencies:
       - npm install
     artifacts:
       paths:
-        - remoteaccess/
+        - application/remote-access-client/remoteaccess/
       when: on_success
       expire_in: 1h
 
@@ -67,7 +67,7 @@ webserver-build:
         - npm run build-android
     artifacts:
       paths:
-        - remoteaccess/
+        - application/remote-access-client/remoteaccess/
       when: on_success
       expire_in: 1h