diff --git a/.dockerignore b/.dockerignore
index 7c5e1eb..1c055df 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,28 +1,14 @@
-# Git
 .git
 .gitignore
-
-# Docker
 Dockerfile
 docker-compose.yml
 .dockerignore
-
-# Documentation
 README.md
 *.md
-
-# IDE
 .vscode
 .idea
 *.iml
-
-# OS
 .DS_Store
 Thumbs.db
-
-# Target directories
-*/target/
-target/
-
-# Logs
-*.log
+**/target
+**/*.log
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..93f5fa4
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+
+[*.{yml,yaml,json}]
+indent_size = 2
+
+[promcode-lyo-server/src/test/java/**.java]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{xml,aird}]
+trim_trailing_whitespace = false
+
+[promcode-lyo-server-model/**]
+indent_size = 2
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 69fb32f..bd5fb4e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,7 +2,7 @@ name: "Docker Build and Push (PROMCODE Server)"
 
 on:
   push:
-    branches: [main, master]
+    branches: [main]
     paths:
       - 'promcode-lyo-server/**'
       - 'promcode-lyo-server-model/**'
@@ -20,29 +20,30 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
+permissions:
+  contents: read
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
   build-and-push:
+    name: Publish server image
+    if: github.repository == 'OSLC/promcode-lyo-server' && (github.ref == 'refs/heads/main' || github.event_name == 'release')
     runs-on: ubuntu-latest
+    timeout-minutes: 40
     permissions:
       contents: read
-      packages: write
+      packages: write # Push the built server image to GHCR.
     
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Check build trigger
-        run: |
-          if [ "${{ github.event_name }}" = "schedule" ]; then
-            echo "🔄 This is a scheduled weekly rebuild to update base images"
-          elif [ "${{ github.event_name }}" = "release" ]; then
-            echo "🚀 This is a release build"
-          else
-            echo "📦 This is a regular build triggered by push"
-          fi
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
+        with:
+          persist-credentials: false
 
       - name: Log in to Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -50,11 +51,11 @@ jobs:
 
       - name: Extract metadata
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            # For pushes to master/main branch or scheduled builds, tag as "latest"
+            # For pushes to main branch or scheduled builds, tag as "latest"
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) || github.event_name == 'schedule' }}
             # For releases, create semantic version tags
             type=semver,pattern={{version}}
@@ -64,11 +65,15 @@ jobs:
             org.opencontainers.image.title=PROMCODE Server
             org.opencontainers.image.description=A demonstration server for OSLC toolchain management of PROject Management of COntracted DElivery
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        id: build
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
         with:
           context: .
           file: ./Dockerfile
@@ -76,15 +81,23 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=promcode-server
+          cache-to: type=gha,mode=max,scope=promcode-server
           # For scheduled builds, don't use cache to ensure fresh base images
           no-cache: ${{ github.event_name == 'schedule' }}
           pull: true
 
       - name: Output image details
+        env:
+          IMAGE_TAGS: ${{ steps.meta.outputs.tags }}
+          IMAGE_DIGEST: ${{ steps.build.outputs.digest }}
         run: |
-          echo "Image has been pushed to:"
-          echo "${{ steps.meta.outputs.tags }}" | while read -r tag; do
-            echo "  - $tag"
-          done
+          printf 'Updated image tags:\n'
+          printf '### Updated image tags\n\n' >> "$GITHUB_STEP_SUMMARY"
+          while IFS= read -r tag; do
+            [ -n "$tag" ] || continue
+            printf '  - %s\n' "$tag"
+            printf -- '- `%s`\n' "$tag" >> "$GITHUB_STEP_SUMMARY"
+          done <<< "$IMAGE_TAGS"
+          printf 'Digest: %s\n' "$IMAGE_DIGEST"
+          printf '\nDigest: `%s`\n' "$IMAGE_DIGEST" >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/maven-acceptance-manual.yml b/.github/workflows/maven-acceptance-manual.yml
index eceb696..bfa8435 100644
--- a/.github/workflows/maven-acceptance-manual.yml
+++ b/.github/workflows/maven-acceptance-manual.yml
@@ -1,57 +1,44 @@
 name: Acceptance test (Lyo HEAD)
-run-name: "acceptance@${{ github.ref_name }} (Lyo@${{ github.event.inputs.lyoBranch }}; comment: ${{ inputs.comment }})"
-
-
+run-name: "acceptance@${{ github.ref_name }} (Lyo@${{ inputs.lyoBranch }}; ${{ inputs.link }})"
 on:
   workflow_dispatch:
     inputs:
       lyoBranch:
-        description: 'Lyo branch to test on'
+        description: Lyo branch to test on
         required: true
-        default: 'master'
+        default: main
       lyoRepo:
-        description: 'Lyo repository or fork'
+        description: Lyo repository or fork
         required: true
-        default: 'eclipse/lyo'
+        default: eclipse-lyo/lyo
       link:
-        description: 'PR/issue link (e.g., to Lyo)'
-
+        description: PR/issue link
+permissions:
+  contents: read
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.lyoRepo }}-${{ github.event.inputs.lyoBranch }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' }}
-
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.lyoRepo }}-${{ inputs.lyoBranch }}
+  cancel-in-progress: true
 jobs:
-  build-jdk17:
+  build:
+    name: Lyo HEAD compatibility
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-#         java-version: [17]
-# #        distribution: ['temurin', 'zulu', 'oracle', 'corretto', 'microsoft', 'liberica']
-#         distribution: ['temurin']
-        include:
-          - java-version: '21'
-            distribution: 'temurin'
-          - java-version: '25'
-            distribution: 'liberica'
-          - java-version: '27'
-            distribution: 'liberica'
+    timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
         with:
-          repository: "${{ github.event.inputs.lyoRepo }}"
-          ref: "${{ github.event.inputs.lyoBranch }}"
+          repository: ${{ inputs.lyoRepo }}
+          ref: ${{ inputs.lyoBranch }}
           path: lyo-trunk
-      - uses: actions/checkout@v6
+          persist-credentials: false
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
         with:
           path: main
-      - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v4
+          persist-credentials: false
+      - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
-          distribution:  ${{ matrix.distribution }}
-          java-version: ${{ matrix.java-version }}
-      - name: 'Maven build (Lyo)'
-        run: mvn -B clean install --file lyo-trunk/pom.xml -DskipTests -Dmaven.javadoc.skip=true -P '!spotless' -P'!spotbugs'
-      - name: 'Maven build (project)'
-        run: |
-          mvn -B clean verify --file main/promcode-lyo-server/pom.xml
+          distribution: temurin
+          java-version: '25'
+      - name: Maven build (Lyo)
+        run: mvn -B --no-transfer-progress clean install --file lyo-trunk/pom.xml -DskipTests -Dmaven.javadoc.skip=true -P '!spotless,!spotbugs'
+      - name: Maven verify (project)
+        run: mvn -B --no-transfer-progress clean verify -Dselfie=readonly --file main/promcode-lyo-server/pom.xml
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6c743ef..2d4c439 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,57 +1,31 @@
 name: CI
-
 on:
   merge_group:
+    types: [checks_requested]
   push:
-    branches: [main, master]
+    branches: [main]
   pull_request:
-    branches: [main, master]
+    branches: [main]
   schedule:
-    - cron: "19 4 * * 4" # catch SNAPSHOT breaking changes
+    - cron: "19 4 * * 4"
   workflow_dispatch:
-
+permissions:
+  contents: read
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' }}
-
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 jobs:
   build:
+    name: build
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        # jdk: ['17', '21']
-        # distribution: ['temurin']
-        # experimental: [false]
-        include:
-          - jdk: '21'
-            distribution: 'temurin'
-            experimental: false
-          - jdk: '25'
-            distribution: 'temurin'
-            experimental: false
-          - jdk: '27'
-            distribution: 'liberica'
-            experimental: false
-          # - jdk: '25-ea'
-          #   distribution: 'zulu'
-          #   experimental: true
-    continue-on-error: ${{ matrix.experimental }}
-
+    timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
         with:
-          distribution: ${{ matrix.distribution }}
-          java-version: ${{ matrix.jdk }}
-      - uses: actions/cache@v4
+          persist-credentials: false
+      - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - name: 'Maven build'
-        run: |
-          mvn -B clean verify --file ./promcode-lyo-server/pom.xml
+          distribution: temurin
+          java-version: '25'
+      - name: Maven verify
+        run: mvn -B --no-transfer-progress clean verify -Dselfie=readonly --file promcode-lyo-server/pom.xml
diff --git a/.gitignore b/.gitignore
index 524f096..80e266a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,6 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
+
+# Maven build output
+**/target/
diff --git a/AGENTS.md b/AGENTS.md
index 55807c0..e27d028 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,8 +1,8 @@
 # AGENTS.md — OSLC PROMCODE Server
 
-Follow human-facing docs: `DEVELOPMENT.md` (build/run) and `CONTRIBUTING.md` (rules).
-
-Agent-specific notes:
-
-- `promcode-server` has **no automated tests**; `mvn test` is a compile check only.
+Follow [DEVELOPMENT.md](DEVELOPMENT.md) and [CONTRIBUTING.md](CONTRIBUTING.md).
 
+- Run `mvn test -Dselfie=readonly` in `promcode-lyo-server/` for the default check.
+- Preserve Lyo Designer user-code guards; do not rewrite generated Java outside them.
+- Prefer Java text blocks for multiline RDF payloads.
+- Run container smoke checks only when Docker or Podman is available.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 93270d1..ce7e3da 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,9 +9,12 @@ This server is generated from a Lyo Designer model (`promcode-lyo-server-model`)
 Prefer making model changes in Lyo Designer to preserve traceability between the
 model and the generated code.
 
+Edit generated Java only inside its user-code guards; change the model when
+changing generated resource types, services, or routing.
+
 ## Before you submit
 
-- `mvn test` should build the module (it has no automated tests yet).
+- `mvn clean verify -Dselfie=readonly` must pass in `promcode-lyo-server/`.
 - Keep `DEVELOPMENT.md` and `AGENTS.md` in sync when the build/test setup changes.
 - Keep CI configuration and `DEVELOPMENT.md` in sync for any significant changes.
 
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index eaf81b6..03d6f5a 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -1,36 +1,50 @@
 # Development — OSLC PROMCODE Server
 
-A sample **OSLC PROMCODE 1.0** server, modelled and generated with
-[Lyo Designer](https://oslc.github.io/developing-oslc-applications/eclipse_lyo/lyo-designer.html).
-The single Maven module is `promcode-lyo-server/` (a WAR).
-
-## Prerequisites
-- JDK 21 (25 recommended)
-- Maven 3.9
-- (Optional) Docker / Docker Compose, for running the server and its Fuseki store
-
-## Building
-
-    cd promcode-lyo-server
-    mvn test
-
-The module currently has **no automated tests**; `mvn test` is a compile check.
-
-## Running the server
-
-The server needs an RDF store (Apache Jena Fuseki). See `README.md` for the full
-Fuseki setup. Quick options:
-
-    # built-in Jetty
-    cd promcode-lyo-server && mvn clean jetty:run-war
-
-    # Tomcat via Maven Cargo
-    mvn clean cargo:run
-
-    # Docker Compose (server + Fuseki together)
-    docker-compose up --build
-
-Then open http://localhost:8080/promcode-server/ (Fuseki on :3030).
-
-> Docker here is for **deployment**, not tests — this repo has no Docker-based
-> automated tests.
+The Maven WAR module is `promcode-lyo-server/`; its Lyo Designer model is in
+`promcode-lyo-server-model/`. Use JDK 25 and Maven 3.9 or newer.
+
+## Build and tests
+
+From `promcode-lyo-server/`:
+
+```sh
+mvn test -Dselfie=readonly
+mvn clean verify -Dselfie=readonly
+```
+
+JUnit 6 tests check PROMCODE Artifact RDF round trips, resource URI encoding,
+and the StorePool SPARQL HTTP endpoint using an embedded MockServer. They require
+neither Docker nor an external Fuseki server. Selfie snapshots are checked into
+test sources; after an intentional representation change, use `-Dselfie=overwrite`
+and review the `.ss` diff before committing.
+
+`verify` also checks test formatting with Spotless. Use `mvn spotless:apply` to
+format tests. Generated main sources are excluded from automatic formatting.
+Run `mvn verify -Pspotbugs` for static analysis and
+`mvn rewrite:dryRun -Prewrite` to preview Java/logging recipe changes in test code.
+SpotBugs currently reports `NM_SAME_SIMPLE_NAME_AS_SUPERCLASS` for the generated
+`servlet.Application` class extending `jakarta.ws.rs.core.Application`; that
+profile fails until the generator's class naming is changed.
+
+The optional **Acceptance test (Lyo HEAD)** workflow builds a selected upstream
+Lyo branch and then verifies this server against the locally installed artifacts.
+Its default is `eclipse-lyo/lyo`, branch `main`.
+
+## Running and configuration
+
+See [README startup instructions](README.md#running-the-oslc-promcode-server)
+for Fuseki setup and server launch commands. Compose builds the root Dockerfile;
+the publication workflow pushes the same server image to GHCR for amd64 and arm64.
+Jetty, Tomcat and the container deploy at `/`; OSLC routes are under `/oslc/`.
+
+Logging uses SLF4J with `src/main/resources/logback.xml`. Set package log levels
+there when diagnosing requests. Store connection defaults live in
+`src/main/resources/store.properties`; the `LYO_STORE_*` environment variables
+override them.
+
+## Generated build configuration
+
+Keep additions inside Lyo Designer user-code guards. After regeneration, check
+the Java 25 compiler target, Logback binding, Tomcat installer configuration,
+and pinned plugin versions in `pom.xml`: those existing generated sections may
+be replaced by generator defaults. Do not format generated Java boilerplate.
diff --git a/Dockerfile b/Dockerfile
index 44ba2f3..f90aa37 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/maven:3-eclipse-temurin-21-alpine AS build
+FROM docker.io/library/maven:3-eclipse-temurin-25-alpine AS build
 
 WORKDIR /src
 # Copy pom.xml first for better Docker layer caching
@@ -13,7 +13,7 @@ COPY . .
 # Build the application
 RUN mvn -B --no-transfer-progress -f promcode-lyo-server/pom.xml -DskipTests clean package -am
 
-FROM docker.io/library/jetty:12-jre21-eclipse-temurin
+FROM docker.io/library/jetty:12.1-jdk25-eclipse-temurin
 
 # Add metadata
 LABEL org.opencontainers.image.title="PROMCODE Server"
@@ -26,6 +26,6 @@ LABEL org.opencontainers.image.licenses="EPL-2.0"
 
 COPY --from=build /src/promcode-lyo-server/target/*.war /var/lib/jetty/webapps/ROOT.war
 
-RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl
+RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl
 
 EXPOSE 8080
diff --git a/README.md b/README.md
index 8638621..d49be9c 100644
--- a/README.md
+++ b/README.md
@@ -7,30 +7,38 @@ This is a sample OSLC PROMCODE server, that is based on the [OASIS OSLC PROMCODE
 
 ## Running the OSLC PROMCODE server
 
-Follow the 3 sections below to:
+Follow the sections below to:
 
 1. [Setup persistent store](#setup-persistent-store)
 1. [Run the OSLC Server](#run-the-oslc-server)
 1. [Navigate the OSLC server](#navigate-to-oslc-server)
 1. [Populate the OSLC server](#populate-the-oslc-server)
 
-### Setup persistent store 
+### Setup persistent store
 
-You will set up an RDF data store to store the OSLC PROMCODE resources. 
+You will set up an RDF data store to store the OSLC PROMCODE resources.
 
 We will utilize the Apache Jena Fuseki that is an open source RDF server. You can select either Docker Compose, Docker version, or Java version.
 
 #### Docker Compose (Recommended)
 The easiest way to run both the PROMCODE server and Fuseki together:
 
-1. Make sure you have Docker and Docker Compose installed
+1. Make sure you have Docker Compose or Podman Compose installed
 2. Run the following command from the repository root:
    ```bash
-   docker-compose up --build
+   docker compose up --build
    ```
+   With Podman, use `podman compose up --build`. The legacy `docker-compose` commands also work when that executable is installed.
 3. This will start both services:
    - Fuseki server at http://localhost:3030 (admin/admin)
-   - PROMCODE server at http://localhost:8080/promcode-server
+   - PROMCODE server at http://localhost:8080/
+
+Compose uses Fuseki dataset `/ds` and persists it in the `fuseki-data` volume.
+The standalone Fuseki examples below use `/dataset`, matching the source build's `store.properties`. Set `LYO_STORE_SPARQL_QUERY_ENDPOINT` and
+`LYO_STORE_SPARQL_UPDATE_ENDPOINT` when using a different dataset.
+
+Set `FUSEKI_PORT` to change Fuseki's host port (default: 3030). The services still
+communicate using their internal container ports.
 
 To stop the services:
 ```bash
@@ -48,14 +56,19 @@ Pre-built Docker images are available from GitHub Container Registry for both x8
 
 ```bash
 # Run the latest version
-docker run -p 8080:8080 ghcr.io/oslc/promcode-lyo-server:latest
+docker run -p 8080:8080 --add-host=host.docker.internal:host-gateway \
+  -e LYO_STORE_SPARQL_QUERY_ENDPOINT=http://host.docker.internal:3030/dataset/sparql \
+  -e LYO_STORE_SPARQL_UPDATE_ENDPOINT=http://host.docker.internal:3030/dataset/update \
+  ghcr.io/oslc/promcode-lyo-server:latest
 
-# Run a specific version
-docker run -p 8080:8080 ghcr.io/oslc/promcode-lyo-server:0.1.0
+# To select a published version, replace :latest with its version tag.
 ```
 
 > **Note:** Images are automatically rebuilt weekly to ensure the latest security updates from base images.
 
+This command connects to a Fuseki `/dataset` on the host. Use `/ds` instead when
+connecting to the Compose Fuseki service through its published host port.
+
 #### Docker version
 
 1. Download docker version of fuseki server from https://repo1.maven.org/maven2/org/apache/jena/jena-fuseki-docker/4.2.0/
@@ -64,7 +77,7 @@ docker run -p 8080:8080 ghcr.io/oslc/promcode-lyo-server:0.1.0
 
 #### Java version
 
-1. Download jar file from https://repo1.maven.org/maven2/org/apache/jena/jena-fuseki-server/ 
+1. Download jar file from https://repo1.maven.org/maven2/org/apache/jena/jena-fuseki-server/
 2. For the latest Java version, run the following command
    - `java -cp jena-fuseki-server-4.2.0.jar org.apache.jena.fuseki.main.cmds.FusekiMainCmd --update --mem /dataset`
 3. For Java 1.8 , run the following command
@@ -75,8 +88,8 @@ docker run -p 8080:8080 ghcr.io/oslc/promcode-lyo-server:0.1.0
 There are multiple options to run the OSLC Server.
 Below are the simplest options if you don't want to use anything except JDK and a Maven installation. Prerequisites:
 
-- JDK 11
-- Maven 3
+- JDK 25
+- Maven 3.9 or newer
 
 #### Using built-in servers directly
 
@@ -95,7 +108,7 @@ Follow these steps to start the server:
 
 ```sh
 cd promcode-lyo-server
-mvn clean cargo:run
+mvn clean package cargo:run -Pwith-jstl-impl
 ```
 
 #### Using Docker Compose
@@ -117,16 +130,16 @@ This will:
 
 The OSLC server is available at the following URL:
 
-- http://localhost:8080/promcode-server/
+- http://localhost:8080/
 
 From that point, you can navigate through the Service Provider Catalog, or using the built-in Swagger Editor.
 
 ### Populate the OSLC server
 
-THe server contains no data at startup. 
+The server contains no data at startup.
 You can add resources to the server by performing resource operations on their creation factories.
 
-This can be done through the built-in Swagger editor, or using the command line. 
+This can be done through the built-in Swagger editor, or using the command line.
 
 **Bash/Linux/macOS:**
 ```bash
@@ -143,7 +156,7 @@ http://localhost:8080/oslc/service1/artifacts/create
 
 **PowerShell/Windows:**
 ```powershell
-curl -i --data-raw '@prefix dcterms: <http://purl.org/dc/terms/> .
+curl.exe -i --data-raw '@prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix oslc_promcode: <http://open-services.net/ns/promcode#> .
 <> a oslc_promcode:Artifact ;
    dcterms:identifier "1" ;
@@ -162,7 +175,7 @@ http://localhost:8080/oslc/service1/artifacts/create
 
 ## Modifying the OSLC PROMCODE server with Lyo Designer
 
-This server is modelled and generated using [Lyo Designer](https://oslc.github.io/developing-oslc-applications/eclipse_lyo/lyo-designer.html). 
+This server is modelled and generated using [Lyo Designer](https://oslc.github.io/developing-oslc-applications/eclipse_lyo/lyo-designer.html).
 
 It is recommended that any changes to the code should be done using LyoDesigner to maintain traceability between the model and the code. Below are some instructions on how to open the projects in this repository with LyoDesigner.
 
@@ -178,7 +191,7 @@ The first step is to [install Lyo Designer](https://oslc.github.io/developing-os
 
 The PROMCODE domain model is already modelled and made available to be used by any PROMCODE server installation.
 
-1. Import the [Lyo Git repository](https://github.com/eclipse/lyo.git)
+1. Import the [Lyo Git repository](https://github.com/eclipse-lyo/lyo.git)
 1. In LyoDesigner, import the Modelling project under the "domains\org.eclipse.lyo.tools.domainmodels" folder.
 
 This project contains the PROMCODE model, and all other OSLC Domain Specifications.
diff --git a/docker-compose.yml b/docker-compose.yml
index 173a778..465b631 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,23 +1,19 @@
-version: '3.8'
-
 services:
   fuseki:
-    image: secoresearch/fuseki:latest
-    container_name: promcode-fuseki
+    image: docker.io/secoresearch/fuseki:latest
     ports:
-      - "127.0.0.1:3030:3030"
+      - "127.0.0.1:${FUSEKI_PORT:-3030}:3030"
     environment:
       - ADMIN_PASSWORD=admin
-      - FUSEKI_DATASET_1=dataset
       - ENABLE_UPDATE=true
     volumes:
-      - fuseki-data:/fuseki-data
+      - fuseki-data:/fuseki-base/databases
     networks:
       - promcode-network
 
   promcode-server:
+    image: ghcr.io/oslc/promcode-lyo-server:latest
     build: .
-    container_name: promcode-server
     ports:
       - "127.0.0.1:8080:8080"
     depends_on:
diff --git a/promcode-lyo-server-model/toolchainModel.xml b/promcode-lyo-server-model/toolchainModel.xml
index 7854b74..4eeec95 100644
--- a/promcode-lyo-server-model/toolchainModel.xml
+++ b/promcode-lyo-server-model/toolchainModel.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oslc4j_tc:Toolchain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oslc4j_ai="http://org.eclipse.lyo/oslc4j/adaptorInterface" xmlns:oslc4j_tc="http://org.eclipse.lyo/oslc4j/toolChain">
-  <adaptorInterfaces name="PROMCODE Server">
-    <serviceProviderCatalog title="Service Provider Catalog" description="Service Provider Catalog">
-      <serviceProviders title="Service Provider" description="Service Provider">
-        <services>
-          <domainSpecification href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#//@domainSpecifications[name='PROMCODE']"/>
-          <creationFactories title="CreationFactory1" label="CreationFactory1" creationURI="create">
-            <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_rx6HgVQEEe6sU62TIv0TVA"/>
-          </creationFactories>
-          <selectionDialogs title="SelectionDialog1" label="SelectionDialog1" dialogURI="selector" hintWidth="750" hintHeight="750">
-            <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_rx6HgVQEEe6sU62TIv0TVA"/>
-          </selectionDialogs>
-          <persistence store="//@adaptorInterfaces.0/@stores.0" creationFactory="true"/>
-        </services>
-        <services>
-          <domainSpecification href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#//@domainSpecifications[name='PROMCODE']"/>
-          <creationFactories title="CreationFactory1" label="CreationFactory1" creationURI="create">
-            <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_9ZqL51QFEe6sU62TIv0TVA"/>
-          </creationFactories>
-          <selectionDialogs title="SelectionDialog1" label="SelectionDialog1" dialogURI="selector" hintWidth="750" hintHeight="750">
-            <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_9ZqL51QFEe6sU62TIv0TVA"/>
-          </selectionDialogs>
-          <persistence store="//@adaptorInterfaces.0/@stores.0" creationFactory="true"/>
-        </services>
-      </serviceProviders>
-    </serviceProviderCatalog>
-    <webServices name="ArtifactService" serviceUrlPattern="artifact" resourceUrlPattern="{id}">
-      <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_rx6HgVQEEe6sU62TIv0TVA"/>
-      <persistence store="//@adaptorInterfaces.0/@stores.0"/>
-    </webServices>
-    <webServices name="ProjectService" serviceUrlPattern="project" resourceUrlPattern="{id}">
-      <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_9ZqL51QFEe6sU62TIv0TVA"/>
-      <persistence store="//@adaptorInterfaces.0/@stores.0"/>
-    </webServices>
-    <specification/>
-    <configuration xsi:type="oslc4j_ai:MavenServerConfiguration" rootServerBaseUrl="http://localhost:8080/" applicationContextPath="/promcode-server" servletUrlPattern="/oslc/*" generateJspFilesForOslcUI="true" jettyPort="8080">
-      <generalConfiguration doNotGenerateFromImportedModels="true" filesBasePath="." javaBasePackageName="org.oasis.oslc.promcode.server"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<oslc4j_tc:Toolchain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oslc4j_ai="http://org.eclipse.lyo/oslc4j/adaptorInterface" xmlns:oslc4j_tc="http://org.eclipse.lyo/oslc4j/toolChain">
+  <adaptorInterfaces name="PROMCODE Server">
+    <serviceProviderCatalog title="Service Provider Catalog" description="Service Provider Catalog">
+      <serviceProviders title="Service Provider" description="Service Provider">
+        <services>
+          <domainSpecification href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#//@domainSpecifications[name='PROMCODE']"/>
+          <creationFactories title="CreationFactory1" label="CreationFactory1" creationURI="create">
+            <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_rx6HgVQEEe6sU62TIv0TVA"/>
+          </creationFactories>
+          <selectionDialogs title="SelectionDialog1" label="SelectionDialog1" dialogURI="selector" hintWidth="750" hintHeight="750">
+            <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_rx6HgVQEEe6sU62TIv0TVA"/>
+          </selectionDialogs>
+          <persistence store="//@adaptorInterfaces.0/@stores.0" creationFactory="true"/>
+        </services>
+        <services>
+          <domainSpecification href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#//@domainSpecifications[name='PROMCODE']"/>
+          <creationFactories title="CreationFactory1" label="CreationFactory1" creationURI="create">
+            <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_9ZqL51QFEe6sU62TIv0TVA"/>
+          </creationFactories>
+          <selectionDialogs title="SelectionDialog1" label="SelectionDialog1" dialogURI="selector" hintWidth="750" hintHeight="750">
+            <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_9ZqL51QFEe6sU62TIv0TVA"/>
+          </selectionDialogs>
+          <persistence store="//@adaptorInterfaces.0/@stores.0" creationFactory="true"/>
+        </services>
+      </serviceProviders>
+    </serviceProviderCatalog>
+    <webServices name="ArtifactService" serviceUrlPattern="artifact" resourceUrlPattern="{id}">
+      <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_rx6HgVQEEe6sU62TIv0TVA"/>
+      <persistence store="//@adaptorInterfaces.0/@stores.0"/>
+    </webServices>
+    <webServices name="ProjectService" serviceUrlPattern="project" resourceUrlPattern="{id}">
+      <resourceTypes href="../org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml#_9ZqL51QFEe6sU62TIv0TVA"/>
+      <persistence store="//@adaptorInterfaces.0/@stores.0"/>
+    </webServices>
+    <specification/>
+    <configuration xsi:type="oslc4j_ai:MavenServerConfiguration" rootServerBaseUrl="http://localhost:8080/" applicationContextPath="/" servletUrlPattern="/oslc/*" generateJspFilesForOslcUI="true" jettyPort="8080">
+      <generalConfiguration doNotGenerateFromImportedModels="true" filesBasePath="." javaBasePackageName="org.oasis.oslc.promcode.server"/>
       <projectConfiguration xsi:type="oslc4j_ai:MavenProjectConfiguration" lyoVersion="7.0.0-SNAPSHOT" groupId="org.oasis.oslc.promcode.server" artifactId="promcode-server" version="0.1.2-SNAPSHOT"/>
-    </configuration>
-    <stores defaultNamedGraph="urn:x-arq:DefaultGraph" sparqlQueryEndpoint="http://localhost:3030/dataset/sparql" sparqlUpdateEndpoint="http://localhost:3030/dataset/update" initialPoolSize="500"/>
-  </adaptorInterfaces>
-  <specification/>
-  <vocabularies/>
-</oslc4j_tc:Toolchain>
+    </configuration>
+    <stores defaultNamedGraph="urn:x-arq:DefaultGraph" sparqlQueryEndpoint="http://localhost:3030/dataset/sparql" sparqlUpdateEndpoint="http://localhost:3030/dataset/update" initialPoolSize="500"/>
+  </adaptorInterfaces>
+  <specification/>
+  <vocabularies/>
+</oslc4j_tc:Toolchain>
diff --git a/promcode-lyo-server/pom.xml b/promcode-lyo-server/pom.xml
index 290d60d..827c918 100644
--- a/promcode-lyo-server/pom.xml
+++ b/promcode-lyo-server/pom.xml
@@ -16,13 +16,13 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.release>21</maven.compiler.release>
+        <maven.compiler.release>25</maven.compiler.release>
         <version.lyo>7.0.0-SNAPSHOT</version.lyo>
         <swagger-ui.version>5.32.8</swagger-ui.version>
         <servlet.port>8080</servlet.port>
-        <application.contextpath>/promcode-server</application.contextpath>
+        <application.contextpath>/</application.contextpath>
         <application.filename>promcode-server</application.filename>
-        
+
         <!-- Start of user code properties
         -->
         <!-- TODO: Add additional properties here to avoid them be overridden upon future re-generation -->
@@ -46,12 +46,59 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-        
+
     </repositories>
     <profiles>
         <!-- Start of user code profiles
         -->
-        <!-- TODO: Add additional profiles here to avoid them be overridden upon future re-generation -->
+        <profile>
+            <id>spotbugs</id>
+            <build><plugins><plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>4.10.4.1</version>
+                <configuration>
+                    <effort>Max</effort>
+                    <threshold>High</threshold>
+                    <xmlOutput>true</xmlOutput>
+                    <failOnError>true</failOnError>
+                </configuration>
+                <executions><execution>
+                    <id>spotbugs-check</id>
+                    <phase>verify</phase>
+                    <goals><goal>check</goal></goals>
+                </execution></executions>
+            </plugin></plugins></build>
+        </profile>
+        <profile>
+            <id>rewrite</id>
+            <build><plugins><plugin>
+                <groupId>org.openrewrite.maven</groupId>
+                <artifactId>rewrite-maven-plugin</artifactId>
+                <version>6.35.0</version>
+                <configuration><exclusions><exclusion>src/main/java/**</exclusion></exclusions><activeRecipes>
+                    <recipe>org.openrewrite.java.migrate.UpgradeToJava21</recipe>
+                    <recipe>org.openrewrite.java.logging.slf4j.ParameterizedLogging</recipe>
+                </activeRecipes></configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-migrate-java</artifactId>
+                        <version>3.34.1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-testing-frameworks</artifactId>
+                        <version>3.35.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-logging-frameworks</artifactId>
+                        <version>3.29.1</version>
+                    </dependency>
+                </dependencies>
+            </plugin></plugins></build>
+        </profile>
         <!-- End of user code
         -->
         <profile>
@@ -74,7 +121,7 @@
               </dependency>
             </dependencies>
         </profile>
-        
+
     </profiles>
     <!-- Start of user code pre_dependencies
     -->
@@ -82,6 +129,10 @@
     -->
    <dependencyManagement>
       <dependencies>
+        <dependency>
+          <groupId>org.junit</groupId><artifactId>junit-bom</artifactId>
+          <version>6.0.3</version><type>pom</type><scope>import</scope>
+        </dependency>
         <dependency>
           <groupId>org.eclipse.lyo</groupId>
           <artifactId>lyo-bom</artifactId>
@@ -95,7 +146,39 @@
         <!-- Specific dependencies -->
         <!-- Start of user code dependencies
         -->
-        <!-- TODO: Add additional dependencies here to avoid them be overridden upon future re-generation -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.diffplug.selfie</groupId>
+            <artifactId>selfie-runner-junit5</artifactId>
+            <version>3.1.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-netty</artifactId>
+            <version>5.15.0</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.5.32</version>
+            <scope>runtime</scope>
+        </dependency>
         <!-- End of user code
         -->
         <!-- General dependencies -->
@@ -103,12 +186,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        
+
         <!-- Servlet dependencies -->
         <dependency>
             <groupId>jakarta.servlet</groupId>
@@ -118,7 +196,7 @@
         <dependency>
             <groupId>jakarta.servlet.jsp.jstl</groupId>
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <!--When running with the jetty-maven-plugin, you 
+            <!--When running with the jetty-maven-plugin, you
             get warnings about jsp classes being scanned from multiple locations.
             adding the "provided" scope avoids these warnings.-->
             <scope>provided</scope>
@@ -154,7 +232,7 @@
             <groupId>org.glassfish.jersey.inject</groupId>
             <artifactId>jersey-hk2</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
@@ -182,7 +260,7 @@
             <artifactId>oslc-domains</artifactId>
             <version>7.0.0-SNAPSHOT</version>
         </dependency>
-        
+
         <!-- Swagger dependencies -->
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
@@ -214,17 +292,68 @@
         <plugins>
             <!-- Start of user code plugins_start
             -->
-            <!-- TODO: Add additional plugins here to avoid them be overridden upon future re-generation -->
-            <!-- End of user code
-            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.6.0</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.6.3</version>
+                <executions>
+                    <execution>
+                        <id>enforce-toolchain</id>
+                        <goals><goal>enforce</goal></goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion><version>[3.9,)</version></requireMavenVersion>
+                                <requireJavaVersion><version>[25,26)</version></requireJavaVersion>
+                                <banDuplicatePomDependencyVersions />
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>org.slf4j:slf4j-simple</exclude>
+                                        <exclude>org.slf4j:slf4j-reload4j</exclude>
+                                        <exclude>log4j:log4j</exclude>
+                                        <exclude>org.apache.logging.log4j:log4j-core</exclude>
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>3.10.2</version>
+                <configuration>
+                    <java>
+                        <!-- Generated main sources require model/generator formatting changes. -->
+                        <includes><include>src/test/java/**/*.java</include></includes>
+                        <toggleOffOn />
+                        <googleJavaFormat>
+                            <version>1.30.0</version>
+                            <style>GOOGLE</style>
+                            <reflowLongStrings>true</reflowLongStrings>
+                            <formatJavadoc>false</formatJavadoc>
+                        </googleJavaFormat>
+                    </java>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>check-format</id>
+                        <phase>verify</phase>
+                        <goals><goal>check</goal></goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- End of user code
+            -->
+<plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-compiler-plugin</artifactId>
-              <version>3.15.0</version>
+              <version>3.16.0</version>
               <configuration>
                 <compilerArgument>
                   -Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally
@@ -241,13 +370,13 @@
                     <_initParams>
                         <org.eclipse.jetty.servlet.Default.useFileMappedBuffer>false</org.eclipse.jetty.servlet.Default.useFileMappedBuffer>
                     </_initParams>
-                  
+
                   </webApp>
                   <httpConnector>
                     <port>${servlet.port}</port>
                   </httpConnector>
                   <scan>5</scan>
-                  
+
                 </configuration>
             </plugin>
             <plugin>
@@ -255,16 +384,14 @@
                 <artifactId>cargo-maven3-plugin</artifactId>
                 <version>1.10.28</version>
                 <configuration>
-                    <!--This plugins supports the following containers-->
                     <container>
-                        <!--These containers are know to work-->
                         <containerId>tomcat10x</containerId>
-                        <containerId>jetty12x</containerId>
-                        <!-- <containerId>payara</containerId> -->
-                        <!-- <containerId>wildfly26x</containerId> -->
-                        <!--These containers are know to fail-->
-                        <!-- Context Root Not Found -->
-                        <!-- <containerId>liberty</containerId> -->
+                        <artifactInstaller>
+                            <groupId>org.apache.tomcat</groupId>
+                            <artifactId>tomcat</artifactId>
+                            <version>10.1.60</version>
+                            <type>zip</type>
+                        </artifactInstaller>
                     </container>
                     <configuration>
                         <properties>
@@ -322,10 +449,10 @@
                             <targetPath>/swagger-ui/dist</targetPath>
                         </resource>
                     </webResources>
-                    
+
                 </configuration>
             </plugin>
-            
+
             <!-- Start of user code plugins_final
             -->
             <!-- End of user code
diff --git a/promcode-lyo-server/src/main/java/org/oasis/oslc/promcode/server/servlet/Application.java b/promcode-lyo-server/src/main/java/org/oasis/oslc/promcode/server/servlet/Application.java
index d48c233..317b392 100644
--- a/promcode-lyo-server/src/main/java/org/oasis/oslc/promcode/server/servlet/Application.java
+++ b/promcode-lyo-server/src/main/java/org/oasis/oslc/promcode/server/servlet/Application.java
@@ -83,7 +83,7 @@
  * Generated by Lyo Designer 7.0.0.202608291004+dev
  */
 
-@OpenAPIDefinition(info = @Info(title = "PROMCODE Server", version = "1.0.0"), servers = @Server(url = "/promcode-server/oslc/"))
+@OpenAPIDefinition(info = @Info(title = "PROMCODE Server", version = "1.0.0"), servers = @Server(url = "/oslc/"))
 public class Application extends jakarta.ws.rs.core.Application {
 
     private static final Set<Class<?>>         RESOURCE_CLASSES                          = new HashSet<Class<?>>();
diff --git a/promcode-lyo-server/src/main/resources/logback.xml b/promcode-lyo-server/src/main/resources/logback.xml
new file mode 100644
index 0000000..3504991
--- /dev/null
+++ b/promcode-lyo-server/src/main/resources/logback.xml
@@ -0,0 +1,6 @@
+<configuration>
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder><pattern>%d{HH:mm:ss.SSS} %-5level [%thread] %logger{36} - %msg%n</pattern></encoder>
+  </appender>
+  <root level="INFO"><appender-ref ref="CONSOLE" /></root>
+</configuration>
diff --git a/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/OslcTestSupport.java b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/OslcTestSupport.java
new file mode 100644
index 0000000..a4bf695
--- /dev/null
+++ b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/OslcTestSupport.java
@@ -0,0 +1,93 @@
+package org.oasis.oslc.promcode.server.testing;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper;
+
+/** Test-only helpers for Lyo 7 POJOs and ordinary RDF graphs. */
+public final class OslcTestSupport {
+  private OslcTestSupport() {}
+
+  public static Model parse(String rdf, String syntax) {
+    Model model = ModelFactory.createDefaultModel();
+    try {
+      model.read(new StringReader(rdf), null, syntax);
+      return model;
+    } catch (RuntimeException failure) {
+      model.close();
+      throw failure;
+    }
+  }
+
+  public static void assertIsomorphic(String expected, String actual, String syntax) {
+    Model expectedModel = parse(expected, syntax);
+    try {
+      Model actualModel = parse(actual, syntax);
+      try {
+        assertTrue(expectedModel.isIsomorphicWith(actualModel), "RDF graphs differ");
+      } finally {
+        actualModel.close();
+      }
+    } finally {
+      expectedModel.close();
+    }
+  }
+
+  public static <T> T readOne(String rdf, String syntax, Class<T> type) throws Exception {
+    Model model = parse(rdf, syntax);
+    try {
+      T[] resources = JenaModelHelper.unmarshal(model, type);
+      assertEquals(1, resources.length, "Expected exactly one " + type.getSimpleName());
+      return resources[0];
+    } finally {
+      model.close();
+    }
+  }
+
+  public static String pojoRdf(Object resource) throws Exception {
+    Model model = JenaModelHelper.createJenaModel(new Object[] {resource});
+    try {
+      StringWriter writer = new StringWriter();
+      model.write(writer, "RDF/XML");
+      return writer.toString();
+    } finally {
+      model.close();
+    }
+  }
+
+  public static String rdfSnapshot(String rdf, String syntax, String mockOrigin) {
+    // Parse explicitly first: the borrowed normalizer's text fallback must not hide bad RDF.
+    Model model = parse(rdf, syntax);
+    String normalized;
+    try {
+      StringWriter writer = new StringWriter();
+      model.write(writer, "RDF/XML");
+      normalized = SnapshotUtils.stabilizeRdf(writer.toString());
+    } finally {
+      model.close();
+    }
+    return mockOrigin == null ? normalized : normalized.replace(mockOrigin, "http://example.test");
+  }
+
+  public static String fixture(String name, Map<String, String> replacements) throws IOException {
+    try (var input = OslcTestSupport.class.getResourceAsStream("/fixtures/" + name)) {
+      if (input == null) throw new IOException("Missing fixture: " + name);
+      String content = new String(input.readAllBytes(), StandardCharsets.UTF_8);
+      for (var replacement : replacements.entrySet()) {
+        content = content.replace("{{" + replacement.getKey() + "}}", replacement.getValue());
+      }
+      if (content.matches("(?s).*\\{\\{[^}]+}}.*")) {
+        throw new IOException("Unresolved placeholder in fixture: " + name);
+      }
+      return content;
+    }
+  }
+}
diff --git a/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/PromcodeRdfTest.java b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/PromcodeRdfTest.java
new file mode 100644
index 0000000..fb91a77
--- /dev/null
+++ b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/PromcodeRdfTest.java
@@ -0,0 +1,51 @@
+package org.oasis.oslc.promcode.server.testing;
+
+import static com.diffplug.selfie.Selfie.expectSelfie;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.net.URI;
+import org.eclipse.lyo.oslc.domains.promcode.Artifact;
+import org.junit.jupiter.api.Test;
+import org.oasis.oslc.promcode.server.ResourcesFactory;
+
+class PromcodeRdfTest {
+  @Test
+  void artifactRoundTripPreservesPromcodeTypeAndProperties() throws Exception {
+    Artifact artifact = new ResourcesFactory("http://example.test/oslc/").createArtifact("1");
+    artifact.setIdentifier("1");
+    artifact.setTitle("A1");
+    artifact.setDescription("UI for making a reservation");
+    String rdf = OslcTestSupport.pojoRdf(artifact);
+    Artifact restored = OslcTestSupport.readOne(rdf, "RDF/XML", Artifact.class);
+    assertEquals(artifact.getAbout(), restored.getAbout());
+    assertEquals(artifact.getTitle(), restored.getTitle());
+    assertEquals(artifact.getIdentifier(), restored.getIdentifier());
+    assertEquals(artifact.getDescription(), restored.getDescription());
+    String expected =
+        """
+        @prefix dcterms: <http://purl.org/dc/terms/> .
+        @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+        <http://example.test/oslc/artifact/1>
+          a <http://open-services.net/ns/promcode#Artifact>;
+          dcterms:identifier "1"; dcterms:title "A1"^^rdf:XMLLiteral;
+          dcterms:description "UI for making a reservation"^^rdf:XMLLiteral .
+        """;
+    var expectedModel = OslcTestSupport.parse(expected, "TURTLE");
+    var actualModel = OslcTestSupport.parse(rdf, "RDF/XML");
+    try {
+      assertTrue(expectedModel.isIsomorphicWith(actualModel), rdf);
+    } finally {
+      expectedModel.close();
+      actualModel.close();
+    }
+    expectSelfie(OslcTestSupport.rdfSnapshot(rdf, "RDF/XML", null)).toMatchDisk();
+  }
+
+  @Test
+  void artifactIdentifierIsEncodedAsOnePathSegment() {
+    ResourcesFactory factory = new ResourcesFactory("http://example.test/oslc/");
+    assertEquals(
+        URI.create("http://example.test/oslc/artifact/A%2FB%20C"),
+        factory.constructURIForArtifact("A/B C"));
+  }
+}
diff --git a/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/PromcodeRdfTest.ss b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/PromcodeRdfTest.ss
new file mode 100644
index 0000000..b5610eb
--- /dev/null
+++ b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/PromcodeRdfTest.ss
@@ -0,0 +1,6 @@
+╔═ artifactRoundTripPreservesPromcodeTypeAndProperties ═╗
+<http://example.test/oslc/artifact/1> <http://purl.org/dc/terms/description> "UI for making a reservation"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
+<http://example.test/oslc/artifact/1> <http://purl.org/dc/terms/identifier> "1" .
+<http://example.test/oslc/artifact/1> <http://purl.org/dc/terms/title> "A1"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
+<http://example.test/oslc/artifact/1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://open-services.net/ns/promcode#Artifact> .
+╔═ [end of file] ═╗
diff --git a/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/SnapshotUtils.java b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/SnapshotUtils.java
new file mode 100644
index 0000000..27b5b2b
--- /dev/null
+++ b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/SnapshotUtils.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ *
+ *  The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *  and the Eclipse Distribution License is available at
+ *  http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ *  SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause
+ */
+package org.oasis.oslc.promcode.server.testing;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import org.apache.jena.rdf.model.AnonId;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+
+public class SnapshotUtils {
+
+  /**
+   * Stabilizes an RDF string by converting it to N-TRIPLES, canonicalizing blank node IDs, and sorting triples.
+   *
+   * <p>This implementation uses a rudimentary canonicalization algorithm: 1. Compute a "signature" for each blank
+   * node based on its non-blank neighbors (properties/values). 2. Sort blank nodes by this signature. 3. Assign
+   * sequential IDs (_:b1, _:b2, ...) to the sorted nodes.
+   *
+   * @param rdfXml the RDF content to stabilize (RDF/XML, Turtle, or N-TRIPLES)
+   * @return the stabilized N-TRIPLES string
+   */
+  public static String stabilizeRdf(String rdfXml) {
+    try {
+      Model model = ModelFactory.createDefaultModel();
+      if (!tryRead(model, rdfXml, "RDF/XML")) {
+        model = ModelFactory.createDefaultModel();
+        if (!tryRead(model, rdfXml, "TURTLE")) {
+          model = ModelFactory.createDefaultModel();
+          if (!tryRead(model, rdfXml, "N-TRIPLES")) {
+            return rdfXml.lines().sorted().collect(Collectors.joining("\n"));
+          }
+        }
+      }
+
+      // 1. Identify all blank nodes
+      List<Resource> blankNodes = new ArrayList<>();
+      model.listSubjects().filterKeep(Resource::isAnon).forEachRemaining(blankNodes::add);
+      model
+          .listObjects()
+          .filterKeep(RDFNode::isAnon)
+          .mapWith(RDFNode::asResource)
+          .forEachRemaining(
+              node -> {
+                if (!blankNodes.contains(node)) {
+                  blankNodes.add(node);
+                }
+              });
+
+      // 2. Compute signatures for sorting
+      // Signature = sorted list of strings representing (Property, Value) for outgoing
+      //             and (Subject, Property) for incoming, IGNORING other blank nodes initially.
+      Map<Resource, String> signatures = new HashMap<>();
+      for (Resource bnode : blankNodes) {
+        List<String> sigParts = new ArrayList<>();
+
+        // Outgoing
+        bnode
+            .listProperties()
+            .forEachRemaining(
+                stmt -> {
+                  if (!stmt.getObject().isAnon()) {
+                    sigParts.add(
+                        "OUT:" + stmt.getPredicate().getURI() + "|" + stmt.getObject().toString());
+                  } else {
+                    sigParts.add("OUT:" + stmt.getPredicate().getURI() + "|_BLANK_");
+                  }
+                });
+
+        // Incoming
+        model
+            .listStatements(null, null, bnode)
+            .forEachRemaining(
+                stmt -> {
+                  if (!stmt.getSubject().isAnon()) {
+                    sigParts.add(
+                        "IN:" + stmt.getSubject().getURI() + "|" + stmt.getPredicate().getURI());
+                  } else {
+                    sigParts.add("IN:_BLANK_|" + stmt.getPredicate().getURI());
+                  }
+                });
+
+        Collections.sort(sigParts);
+        signatures.put(bnode, String.join(";;", sigParts));
+      }
+
+      // 3. Sort blank nodes by signature
+      blankNodes.sort(Comparator.comparing(signatures::get));
+
+      // 4. Create a mapping to new IDs
+      Map<Resource, Resource> remap = new HashMap<>();
+      AtomicInteger counter = new AtomicInteger(1);
+      for (Resource bnode : blankNodes) {
+        // Check if we already mapped it (duplicates in list?) -> logic above handles uniqueness,
+        // but standard
+        // set check is good
+        if (!remap.containsKey(bnode)) {
+          Resource newBNode = model.createResource(new AnonId("b" + counter.getAndIncrement()));
+          remap.put(bnode, newBNode);
+        }
+      }
+
+      // 5. Create new model with renamed blank nodes
+      Model newModel = ModelFactory.createDefaultModel();
+      model
+          .listStatements()
+          .forEachRemaining(
+              stmt -> {
+                Resource s = stmt.getSubject();
+                Property p = stmt.getPredicate();
+                RDFNode o = stmt.getObject();
+
+                if (s.isAnon() && remap.containsKey(s)) {
+                  s = remap.get(s);
+                }
+                if (o.isAnon() && remap.containsKey(o.asResource())) {
+                  o = remap.get(o.asResource());
+                }
+
+                newModel.add(s, p, o);
+              });
+
+      StringWriter out = new StringWriter();
+      newModel.write(out, "N-TRIPLES");
+
+      return out.toString()
+          .lines()
+          .filter(line -> !line.isBlank())
+          .sorted()
+          .collect(Collectors.joining("\n"));
+
+    } catch (Exception e) {
+      // Fallback to primitive clean if parsing fails, or return original
+      return rdfXml.lines().sorted().collect(Collectors.joining("\n"));
+    }
+  }
+
+  private static boolean tryRead(Model model, String rdfContent, String lang) {
+    try {
+      model.read(new StringReader(rdfContent), null, lang);
+      return true;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+}
diff --git a/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/StoreEndpointTest.java b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/StoreEndpointTest.java
new file mode 100644
index 0000000..8f39720
--- /dev/null
+++ b/promcode-lyo-server/src/test/java/org/oasis/oslc/promcode/server/testing/StoreEndpointTest.java
@@ -0,0 +1,48 @@
+package org.oasis.oslc.promcode.server.testing;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+import java.net.URI;
+import org.eclipse.lyo.store.StorePool;
+import org.junit.jupiter.api.Test;
+import org.mockserver.integration.ClientAndServer;
+
+class StoreEndpointTest {
+  @Test
+  void configuredStoreQueriesTheNamedGraphAndSubject() {
+    ClientAndServer mock = ClientAndServer.startClientAndServer(0);
+    try {
+      mock.when(request().withPath("/ds/sparql"))
+          .respond(
+              response()
+                  .withContentType(org.mockserver.model.MediaType.APPLICATION_JSON)
+                  .withBody("{\"head\":{},\"boolean\":true}"));
+      URI graph = URI.create("urn:x-arq:DefaultGraph");
+      String endpoint = "http://localhost:" + mock.getLocalPort() + "/ds/";
+      StorePool pool =
+          new StorePool(
+              1,
+              graph,
+              URI.create(endpoint + "sparql"),
+              URI.create(endpoint + "update"),
+              null,
+              null);
+      var store = pool.getStore();
+      try {
+        assertTrue(store.resourceExists(graph, URI.create("http://example.test/artifact/1")));
+      } finally {
+        pool.releaseStore(store);
+      }
+      var requests = mock.retrieveRecordedRequests(request().withPath("/ds/sparql"));
+      assertEquals(1, requests.length);
+      String query = requests[0].getFirstQueryStringParameter("query");
+      assertNotNull(query);
+      assertTrue(query.contains("urn:x-arq:DefaultGraph"));
+      assertTrue(query.contains("http://example.test/artifact/1"));
+    } finally {
+      mock.stop();
+    }
+  }
+}