diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3fa7b0e3925802d5820344458ae35ae9b4747350..a08ebd2da154732ebbcf2a406423d299f8e2898c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ variables:
   ARCHIVE_NAME: "org.etsi.mts.tdl.extras.updatesite-1.0.0-SNAPSHOT.zip"
   SITE_ARCHIVE: "${SITE_LOCATION}/${ARCHIVE_NAME}"
   SITE_PATH: "${SITE_LOCATION}/repository/"
-  REPO_PREFIX: "https://labs.etsi.org/rep/top/extras/-/jobs"
+  REPO_PREFIX: "https://labs.etsi.org/rep/top/top-extras/-/jobs"
   REPO_PATH: "artifacts/raw/updatesite/org.etsi.mts.tdl.extras.updatesite/target/repository/"
   PACKAGE_NAME: "TOP Extras Interim Build"
   PACKAGE_NAME_MAIN: "TOP Extras Build"
@@ -45,7 +45,7 @@ variables:
   MAIN_KEY: "stable"
   RELEASE_KEY: "beta"
   RELEASE_PATH: "public/updatesite/${RELEASE_KEY}"
-  RELEASE_PAGE: "https://top.etsi.org/extras/updatesite/${RELEASE_KEY}"
+  RELEASE_PAGE: "https://top.etsi.org/top-extras/updatesite/${RELEASE_KEY}"
   STANDALONE_LOCATION: "plugins/org.etsi.mts.tdl.standalone/target"
   STANDALONE_NAME: "org.etsi.mts.tdl.standalone-1.0.0-SNAPSHOT-shadow.jar"
   STANDALONE_PATH: "${STANDALONE_LOCATION}/${STANDALONE_NAME}"
@@ -90,7 +90,7 @@ variables:
 # for verifying and deploying images
 # Maven 3.8.x REQUIRES HTTPS repositories.
 # See https://maven.apache.org/docs/3.8.1/release-notes.html#how-to-fix-when-i-get-a-http-repository-blocked for more.
-image: maven:3-openjdk-11
+image: maven:3-openjdk-17
 
 # Cache downloaded dependencies and plugins between builds.
 # To keep cache across branches add 'key: "$CI_JOB_NAME"'
@@ -181,12 +181,12 @@ prepare-job:
         echo "RELEASE_KEY=$RELEASE_KEY" >> variables.env
         echo "PACKAGE_NAME=$PACKAGE_NAME_MAIN" >> variables.env
         echo "RELEASE_PATH=public/updatesite/${RELEASE_KEY}" >> variables.env
-        echo "RELEASE_PAGE=https://top.etsi.org/extras/updatesite/${RELEASE_KEY}" >> variables.env
+        echo "RELEASE_PAGE=https://top.etsi.org/top-extras/updatesite/${RELEASE_KEY}" >> variables.env
       fi
     - echo "EXTRA_DESCRIPTION=automatic-release" >> variables.env
     - echo "VERSION=$VERSION" >> variables.env
-    - echo "PACKAGE_REGISTRY_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/extras/${VERSION}" >> variables.env
-    - echo "PACKAGE_LATEST_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/extras/latest" >> variables.env
+    - echo "PACKAGE_REGISTRY_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/top-extras/${VERSION}" >> variables.env
+    - echo "PACKAGE_LATEST_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/top-extras/latest" >> variables.env
     - cat variables.env
   artifacts:
     reports: