27 changed files with 576 additions and 1596 deletions
--- a/.DEBIAN/control
+++ b/.DEBIAN/control
@ -2,7 +2,7 @@ Package: fastapi-dls
 Version: 0.0
 Architecture: all
 Maintainer: Oscar Krause oscar.krause@collinwebdesigns.de
-Depends: python3, python3-fastapi, python3-uvicorn, python3-dotenv, python3-dateutil, python3-josepy, python3-sqlalchemy, python3-cryptography, python3-markdown, uvicorn, openssl
+Depends: python3, python3-fastapi, python3-uvicorn, python3-dotenv, python3-dateutil, python3-jose, python3-sqlalchemy, python3-pycryptodome, python3-markdown, uvicorn, openssl
 Recommends: curl
 Installed-Size: 10240
 Homepage: https://git.collinwebdesigns.de/oscar.krause/fastapi-dls
--- a/.DEBIAN/env.default
+++ b/.DEBIAN/env.default
@ -21,3 +21,7 @@ DATABASE=sqlite:////etc/fastapi-dls/db.sqlite
 #SITE_KEY_XID="00000000-0000-0000-0000-000000000000"
 #INSTANCE_REF="10000000-0000-0000-0000-000000000001"
 #ALLOTMENT_REF="20000000-0000-0000-0000-000000000001"
+
+# Site-wide signing keys
+INSTANCE_KEY_RSA=/etc/fastapi-dls/instance.private.pem
+INSTANCE_KEY_PUB=/etc/fastapi-dls/instance.public.pem
--- a/.DEBIAN/postinst
+++ b/.DEBIAN/postinst
@ -3,6 +3,14 @@
 WORKING_DIR=/usr/share/fastapi-dls
 CONFIG_DIR=/etc/fastapi-dls

+if [ ! -f $CONFIG_DIR/instance.private.pem ]; then
+  echo "> Create dls-instance keypair ..."
+  openssl genrsa -out $CONFIG_DIR/instance.private.pem 2048
+  openssl rsa -in $CONFIG_DIR/instance.private.pem -outform PEM -pubout -out $CONFIG_DIR/instance.public.pem
+else
+  echo "> Create dls-instance keypair skipped! (exists)"
+fi
+
 while true; do
  [ -f $CONFIG_DIR/webserver.key ] && default_answer="N" || default_answer="Y"
  [ $default_answer == "Y" ] && V="Y/n" || V="y/N"
--- a/.DEBIAN/requirements-bookworm-12.txt
+++ b/.DEBIAN/requirements-bookworm-12.txt
@ -1,8 +1,8 @@
 # https://packages.debian.org/hu/
 fastapi==0.92.0
 uvicorn[standard]==0.17.6
-python-jose[cryptography]==3.3.0
-cryptography==38.0.4
+python-jose[pycryptodome]==3.3.0
+pycryptodome==3.11.0
 python-dateutil==2.8.2
 sqlalchemy==1.4.46
 markdown==3.4.1
--- a/.DEBIAN/requirements-ubuntu-23.04.txt
+++ b/.DEBIAN/requirements-ubuntu-23.04.txt
@ -0,0 +1,10 @@
+# https://packages.ubuntu.com
+fastapi==0.91.0
+uvicorn[standard]==0.15.0
+python-jose[pycryptodome]==3.3.0
+pycryptodome==3.11.0
+python-dateutil==2.8.2
+sqlalchemy==1.4.46
+markdown==3.4.3
+python-dotenv==0.21.0
+jinja2==3.1.2
--- a/.DEBIAN/requirements-ubuntu-23.10.txt
+++ b/.DEBIAN/requirements-ubuntu-23.10.txt
@ -0,0 +1,10 @@
+# https://packages.ubuntu.com
+fastapi==0.101.0
+uvicorn[standard]==0.23.2
+python-jose[pycryptodome]==3.3.0
+pycryptodome==3.11.0
+python-dateutil==2.8.2
+sqlalchemy==1.4.47
+markdown==3.4.4
+python-dotenv==1.0.0
+jinja2==3.1.2
--- a/.DEBIAN/requirements-ubuntu-24.04.txt
+++ b/.DEBIAN/requirements-ubuntu-24.04.txt
@ -1,8 +1,8 @@
 # https://packages.ubuntu.com
 fastapi==0.101.0
 uvicorn[standard]==0.27.1
-python-jose[cryptography]==3.3.0
-cryptography==41.0.7
+python-jose[pycryptodome]==3.3.0
+pycryptodome==3.20.0
 python-dateutil==2.8.2
 sqlalchemy==1.4.50
 markdown==3.5.2
--- a/.DEBIAN/requirements-ubuntu-24.10.txt
+++ b/.DEBIAN/requirements-ubuntu-24.10.txt
@ -1,10 +0,0 @@
-# https://packages.ubuntu.com
-fastapi==0.110.3
-uvicorn[standard]==0.30.3
-python-jose[cryptography]==3.3.0
-cryptography==42.0.5
-python-dateutil==2.9.0
-sqlalchemy==2.0.32
-markdown==3.6
-python-dotenv==1.0.1
-jinja2==3.1.3
--- a/.PKGBUILD/PKGBUILD
+++ b/.PKGBUILD/PKGBUILD
@ -8,7 +8,7 @@ pkgdesc='NVIDIA DLS server implementation with FastAPI'
 arch=('any')
 url='https://git.collinwebdesigns.de/oscar.krause/fastapi-dls'
 license=('MIT')
-depends=('python' 'python-jose' 'python-starlette' 'python-httpx' 'python-fastapi' 'python-dotenv' 'python-dateutil' 'python-sqlalchemy' 'python-cryptography' 'uvicorn' 'python-markdown' 'openssl')
+depends=('python' 'python-jose' 'python-starlette' 'python-httpx' 'python-fastapi' 'python-dotenv' 'python-dateutil' 'python-sqlalchemy' 'python-pycryptodome' 'uvicorn' 'python-markdown' 'openssl')
 provider=("$pkgname")
 install="$pkgname.install"
 backup=('etc/default/fastapi-dls')
@ -17,7 +17,7 @@ source=("git+file://${CI_PROJECT_DIR}"
        "$pkgname.service"
        "$pkgname.tmpfiles")
 sha256sums=('SKIP'
-            'a4776a0ae4671751065bf3e98aa707030b8b5ffe42dde942c51050dab5028c54'
+            'fbd015449a30c0ae82733289a56eb98151dcfab66c91b37fe8e202e39f7a5edb'
            '2719338541104c537453a65261c012dda58e1dbee99154cf4f33b526ee6ca22e'
            '3dc60140c08122a8ec0e7fa7f0937eb8c1288058890ba09478420fc30ce9e30c')

@ -30,6 +30,8 @@ pkgver() {
 check() {
    cd "$srcdir/$pkgname/test"
    mkdir "$srcdir/$pkgname/app/cert"
+    openssl genrsa -out "$srcdir/$pkgname/app/cert/instance.private.pem" 2048
+    openssl rsa -in "$srcdir/$pkgname/app/cert/instance.private.pem" -outform PEM -pubout -out "$srcdir/$pkgname/app/cert/instance.public.pem"
    python "$srcdir/$pkgname/test/main.py"
    rm -rf "$srcdir/$pkgname/app/cert"
 }
@ -37,7 +39,7 @@ check() {
 package() {
    install -d "$pkgdir/usr/share/doc/$pkgname"
    install -d "$pkgdir/var/lib/$pkgname/cert"
-    #cp -r "$srcdir/$pkgname/doc"/* "$pkgdir/usr/share/doc/$pkgname/"
+    cp -r "$srcdir/$pkgname/doc"/* "$pkgdir/usr/share/doc/$pkgname/"
    install -Dm644 "$srcdir/$pkgname/README.md" "$pkgdir/usr/share/doc/$pkgname/README.md"
    install -Dm644 "$srcdir/$pkgname/version.env" "$pkgdir/usr/share/doc/$pkgname/version.env"

--- a/.PKGBUILD/fastapi-dls.default
+++ b/.PKGBUILD/fastapi-dls.default
@ -19,6 +19,10 @@ DATABASE="sqlite:////var/lib/fastapi-dls/db.sqlite"
 SITE_KEY_XID="<<sitekey>>"
 INSTANCE_REF="<<instanceref>>"

+# Site-wide signing keys
+INSTANCE_KEY_RSA="/var/lib/fastapi-dls/instance.private.pem"
+INSTANCE_KEY_PUB="/var/lib/fastapi-dls/instance.public.pem"
+
 # TLS certificate
 INSTANCE_SSL_CERT="/var/lib/fastapi-dls/cert/webserver.crt"
 INSTANCE_SSL_KEY="/var/lib/fastapi-dls/cert/webserver.key"
--- a/.PKGBUILD/fastapi-dls.install
+++ b/.PKGBUILD/fastapi-dls.install
@ -7,4 +7,8 @@ post_install() {
    echo
    echo 'A valid HTTPS certificate needs to be installed to /var/lib/fastapi-dls/cert/webserver.{crt,key}'
    echo 'A self-signed certificate can be generated with: openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout /var/lib/fastapi-dls/cert/webserver.key -out /var/lib/fastapi-dls/cert/webserver.crt'
+    echo
+    echo 'The signing keys for your instance need to be generated as well. Generate them with these commands:'
+    echo 'openssl genrsa -out /var/lib/fastapi-dls/instance.private.pem 2048'
+    echo 'openssl rsa -in /var/lib/fastapi-dls/instance.private.pem -outform PEM -pubout -out /var/lib/fastapi-dls/instance.public.pem'
 }
--- a/.UNRAID/FastAPI-DLS.xml
+++ b/.UNRAID/FastAPI-DLS.xml
@ -18,6 +18,9 @@ Make sure you create these certificates before starting the container for the fi
 WORKING_DIR=/mnt/user/appdata/fastapi-dls/cert&#xD;
 mkdir -p $WORKING_DIR&#xD;
 cd $WORKING_DIR&#xD;
+# create instance private and public key for singing JWT's&#xD;
+openssl genrsa -out $WORKING_DIR/instance.private.pem 2048 &#xD;
+openssl rsa -in $WORKING_DIR/instance.private.pem -outform PEM -pubout -out $WORKING_DIR/instance.public.pem&#xD;
 # create ssl certificate for integrated webserver (uvicorn) - because clients rely on ssl&#xD;
 openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout  $WORKING_DIR/webserver.key -out $WORKING_DIR/webserver.crt&#xD;
 ```&#xD;
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,6 @@
 .DS_Store
 venv/
 .idea/
-*.sqlite
+app/*.sqlite*
 app/cert/*.*
 .pytest_cache
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -16,12 +16,11 @@ build:docker:
  interruptible: true
  stage: build
  rules:
-    # deployment is in "deploy:docker:"
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
      changes:
        - app/**/*
        - Dockerfile
-        - requirements.txt
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
  tags: [ docker ]
  before_script:
    - docker buildx inspect
@ -44,13 +43,16 @@ build:apt:
    - if: $CI_COMMIT_TAG
      variables:
        VERSION: $CI_COMMIT_REF_NAME
-    - if: ($CI_PIPELINE_SOURCE == 'merge_request_event') || ($CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH)
+    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
      changes:
        - app/**/*
        - .DEBIAN/**/*
        - .gitlab-ci.yml
      variables:
        VERSION: "0.0.1"
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      variables:
+        VERSION: "0.0.1"
  before_script:
    - echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > version.env
    # install build dependencies
@ -91,13 +93,16 @@ build:pacman:
    - if: $CI_COMMIT_TAG
      variables:
        VERSION: $CI_COMMIT_REF_NAME
-    - if: ($CI_PIPELINE_SOURCE == 'merge_request_event') || ($CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH)
+    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
      changes:
        - app/**/*
        - .PKGBUILD/**/*
        - .gitlab-ci.yml
      variables:
        VERSION: "0.0.1"
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      variables:
+        VERSION: "0.0.1"
  before_script:
    #- echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > version.env
    # install build dependencies
@ -120,12 +125,13 @@ build:pacman:
    paths:
      - "*.pkg.tar.zst"

-test:python:
+test:
  image: $IMAGE
  stage: test
  interruptible: true
  rules:
    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_TAG
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
      changes:
@ -135,49 +141,35 @@ test:python:
    DATABASE: sqlite:///../app/db.sqlite
  parallel:
    matrix:
-      - IMAGE:
-          # https://devguide.python.org/versions/#supported-versions
-#          - python:3.14-rc-alpine  # EOL 2030-10 =>  uvicorn does not support 3.14 yet
-          - python:3.13-alpine  # EOL 2029-10
-          - python:3.12-alpine  # EOL 2028-10
-          - python:3.11-alpine  # EOL 2027-10
-#          - python:3.10-alpine  # EOL 2026-10 => ImportError: cannot import name 'UTC' from 'datetime'
-#          - python:3.9-alpine  # EOL 2025-10 => ImportError: cannot import name 'UTC' from 'datetime'
+      - IMAGE: [ 'python:3.11-slim-bookworm', 'python:3.12-slim-bullseye' ]
+        REQUIREMENTS:
+          - requirements.txt
+          - .DEBIAN/requirements-bookworm-12.txt
+          - .DEBIAN/requirements-ubuntu-23.10.txt
+          - .DEBIAN/requirements-ubuntu-24.04.txt
  before_script:
-    - apk --no-cache add openssl
-    - python3 -m venv venv
-    - source venv/bin/activate
-    - pip install --upgrade pip
-    - pip install -r requirements.txt
-    - pip install pytest pytest-cov pytest-custom_exit_code httpx
+    - apt-get update && apt-get install -y python3-dev gcc
+    - pip install -r $REQUIREMENTS
+    - pip install pytest httpx
    - mkdir -p app/cert
+    - openssl genrsa -out app/cert/instance.private.pem 2048
+    - openssl rsa -in app/cert/instance.private.pem -outform PEM -pubout -out app/cert/instance.public.pem
    - cd test
  script:
    - python -m pytest main.py --junitxml=report.xml
  artifacts:
    reports:
+      dotenv: version.env
      junit: ['**/report.xml']

-test:apt:
-  image: $IMAGE
+.test:linux:
  stage: test
  rules:
-    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: ($CI_PIPELINE_SOURCE == 'merge_request_event') || ($CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH)
+    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
      changes:
        - app/**/*
        - .DEBIAN/**/*
-        - .gitlab-ci.yml
-      variables:
-        VERSION: "0.0.1"
-  parallel:
-    matrix:
-      - IMAGE:
-          - debian:trixie-slim # EOL: t.b.a.
-          - debian:bookworm-slim # EOL: June 06, 2026
-          - debian:bookworm-slim # EOL: June 06, 2026
-          - ubuntu:24.04 # EOL: April 2036
-          - ubuntu:24.10
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
  needs:
    - job: build:apt
      artifacts: true
@ -209,15 +201,22 @@ test:apt:
    - apt-get purge -qq -y fastapi-dls
    - apt-get autoremove -qq -y && apt-get clean -qq

-test:pacman:archlinux:
+test:debian:
+  extends: .test:linux
+  image: debian:bookworm-slim
+
+test:ubuntu:
+  extends: .test:linux
+  image: ubuntu:24.04
+
+test:archlinux:
  image: archlinux:base
  rules:
-    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
      changes:
        - app/**/*
        - .PKGBUILD/**/*
-        - .gitlab-ci.yml
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
  needs:
    - job: build:pacman
      artifacts: true
@ -251,7 +250,7 @@ semgrep-sast:

 test_coverage:
 #  extends: test
-  image: python:3.12-slim-bookworm
+  image: python:3.11-slim-bookworm
  allow_failure: true
  stage: test
  rules:
@ -261,17 +260,19 @@ test_coverage:
  before_script:
    - apt-get update && apt-get install -y python3-dev gcc
    - pip install -r requirements.txt
-    - pip install pytest pytest-cov pytest-custom_exit_code httpx
+    - pip install pytest httpx
    - mkdir -p app/cert
+    - openssl genrsa -out app/cert/instance.private.pem 2048
+    - openssl rsa -in app/cert/instance.private.pem -outform PEM -pubout -out app/cert/instance.public.pem
    - cd test
  script:
-    - coverage run -m pytest main.py --junitxml=report.xml --suppress-no-test-exit-code
+    - pip install pytest pytest-cov
+    - coverage run -m pytest main.py
    - coverage report
    - coverage xml
  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
  artifacts:
    reports:
-      junit: [ '**/report.xml' ]
      coverage_report:
        coverage_format: cobertura
        path: '**/coverage.xml'
@ -290,12 +291,15 @@ gemnasium-python-dependency_scanning:
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

+.deploy:
+  rules:
+    - if: $CI_COMMIT_TAG
+
 deploy:docker:
+  extends: .deploy
  image: docker:dind
  stage: deploy
  tags: [ docker ]
-  rules:
-    - if: $CI_COMMIT_TAG
  before_script:
    - echo "Building docker image for commit $CI_COMMIT_SHA with version $CI_COMMIT_REF_NAME"
    - docker buildx inspect
@ -314,10 +318,9 @@ deploy:docker:

 deploy:apt:
  # doc: https://git.collinwebdesigns.de/help/user/packages/debian_repository/index.md#install-a-package
+  extends: .deploy
  image: debian:bookworm-slim
  stage: deploy
-  rules:
-    - if: $CI_COMMIT_TAG
  needs:
    - job: build:apt
      artifacts: true
@ -354,10 +357,9 @@ deploy:apt:
    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${EXPORT_NAME} "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE_NAME}/${PACKAGE_VERSION}/${EXPORT_NAME}"'

 deploy:pacman:
+  extends: .deploy
  image: archlinux:base-devel
  stage: deploy
-  rules:
-    - if: $CI_COMMIT_TAG
  needs:
    - job: build:pacman
      artifacts: true
@ -378,7 +380,7 @@ deploy:pacman:
 release:
  image: registry.gitlab.com/gitlab-org/release-cli:latest
  stage: .post
-  needs: [ deploy:docker, deploy:apt, deploy:pacman ]
+  needs: [ test ]
  rules:
    - if: $CI_COMMIT_TAG
  script:
@ -393,4 +395,4 @@ release:
        - name: 'Package Registry'
          url: 'https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/-/packages'
        - name: 'Container Registry'
-          url: 'https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/container_registry/70'
+          url: 'https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/container_registry/40'
--- a/2
+++ b/2
@ -10,7 +10,7 @@ RUN apk update \
 && apk add --no-cache --virtual build-deps gcc g++ python3-dev musl-dev pkgconfig \
 && apk add --no-cache curl postgresql postgresql-dev mariadb-dev sqlite-dev \
 && pip install --no-cache-dir --upgrade uvicorn \
- && pip install --no-cache-dir psycopg2==2.9.10 mysqlclient==2.2.7 pysqlite3==0.5.4 \
+ && pip install --no-cache-dir psycopg2==2.9.9 mysqlclient==2.2.4 pysqlite3==0.5.2 \
 && pip install --no-cache-dir -r /tmp/requirements.txt \
 && apk del build-deps

--- a/FAQ.md
+++ b/FAQ.md
@ -0,0 +1,17 @@
+# FAQ
+
+## `Failed to acquire license from <ip> (Info: <license> - Error: The allowed time to process response has expired)`
+
+- Did your timezone settings are correct on fastapi-dls **and your guest**?
+
+- Did you download the client-token more than an hour ago?
+
+Please download a new client-token. The guest have to register within an hour after client-token was created.
+
+
+## `jose.exceptions.JWTError: Signature verification failed.`
+
+- Did you recreated `instance.public.pem` / `instance.private.pem`?
+
+Then you have to download a **new** client-token on each of your guests.
+
--- a/README.md
+++ b/README.md
@ -2,15 +2,8 @@

 Minimal Delegated License Service (DLS).

-> [!warning] Branch support
-> FastAPI-DLS Version 1.x supports up to **`17.x`** releases. \
-> FastAPI-DLS Version 2.x is backwards compatible to `17.x` and supports **`18.x`** releases in combination
-> with [gridd-unlock-patcher](https://git.collinwebdesigns.de/oscar.krause/gridd-unlock-patcher).
-> Other combinations of FastAPI-DLS and Driver-Branches may work but are not tested.
-
-> [!note] Compatibility
-> Compatibility tested with official NLS 2.0.1, 2.1.0, 3.1.0, 3.3.1, 3.4.0. For Driver compatibility
-> see [compatibility matrix](#vgpu-software-compatibility-matrix).
+Compatibility tested with official NLS 2.0.1, 2.1.0, 3.1.0, 3.3.1. For Driver compatibility
+see [compatibility matrix](#vgpu-software-compatibility-matrix).

 This service can be used without internet connection.
 Only the clients need a connection to this service on configured port.
@ -30,7 +23,6 @@ Only the clients need a connection to this service on configured port.
 * [NVIDIA vGPU Guide](https://gitlab.com/polloloco/vgpu-proxmox) - This document serves as a guide to install NVIDIA vGPU host drivers on the latest Proxmox VE version
 * [vgpu_unlock](https://github.com/DualCoder/vgpu_unlock) - Unlock vGPU functionality for consumer-grade Nvidia GPUs.
 * [vGPU_Unlock Wiki](https://docs.google.com/document/d/1pzrWJ9h-zANCtyqRgS7Vzla0Y8Ea2-5z2HEi4X75d2Q) - Guide for `vgpu_unlock`
-* [Proxmox 8 vGPU in VMs and LXC Containers](https://medium.com/@dionisievldulrincz/proxmox-8-vgpu-in-vms-and-lxc-containers-4146400207a3) - Install *Merged Drivers* for using in Proxmox VMs and LXCs
 * [Proxmox All-In-One Installer Script](https://wvthoog.nl/proxmox-vgpu-v3/) - Also known as `proxmox-installer.sh`

 ---
@ -69,6 +61,9 @@ The images include database drivers for `postgres`, `mariadb` and `sqlite`.
 WORKING_DIR=/opt/docker/fastapi-dls/cert
 mkdir -p $WORKING_DIR
 cd $WORKING_DIR
+# create instance private and public key for singing JWT's
+openssl genrsa -out $WORKING_DIR/instance.private.pem 2048 
+openssl rsa -in $WORKING_DIR/instance.private.pem -outform PEM -pubout -out $WORKING_DIR/instance.public.pem
 # create ssl certificate for integrated webserver (uvicorn) - because clients rely on ssl
 openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout  $WORKING_DIR/webserver.key -out $WORKING_DIR/webserver.crt
 ```
@ -86,7 +81,7 @@ docker run -e DLS_URL=`hostname -i` -e DLS_PORT=443 -p 443:443 -v $WORKING_DIR:/

 See [`examples`](examples) directory for more advanced examples (with reverse proxy usage).

-> Adjust `REQUIRED` variables as needed
+> Adjust *REQUIRED* variables as needed

 ```yaml
 version: '3.9'
@ -153,6 +148,9 @@ chown -R www-data:www-data $WORKING_DIR
 WORKING_DIR=/opt/fastapi-dls/app/cert
 mkdir -p $WORKING_DIR
 cd $WORKING_DIR
+# create instance private and public key for singing JWT's
+openssl genrsa -out $WORKING_DIR/instance.private.pem 2048 
+openssl rsa -in $WORKING_DIR/instance.private.pem -outform PEM -pubout -out $WORKING_DIR/instance.public.pem
 # create ssl certificate for integrated webserver (uvicorn) - because clients rely on ssl
 openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout  $WORKING_DIR/webserver.key -out $WORKING_DIR/webserver.crt
 chown -R www-data:www-data $WORKING_DIR
@ -252,6 +250,9 @@ CERT_DIR=${BASE_DIR}/app/cert
 SERVICE_USER=dls
 mkdir ${CERT_DIR}
 cd ${CERT_DIR}
+# create instance private and public key for singing JWT's
+openssl genrsa -out ${CERT_DIR}/instance.private.pem 2048 
+openssl rsa -in ${CERT_DIR}/instance.private.pem -outform PEM -pubout -out ${CERT_DIR}/instance.public.pem
 # create ssl certificate for integrated webserver (uvicorn) - because clients rely on ssl
 openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout  ${CERT_DIR}/webserver.key -out ${CERT_DIR}/webserver.crt
 chown -R ${SERVICE_USER} ${CERT_DIR}
@ -327,14 +328,13 @@ Packages are available here:

 - [GitLab-Registry](https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/-/packages)

-Successful tested with (**LTS Version**):
+Successful tested with:

- **Debian 12 (Bookworm)** (EOL: June 06, 2026)
- *Ubuntu 22.10 (Kinetic Kudu)* (EOL: July 20, 2023)
- *Ubuntu 23.04 (Lunar Lobster)* (EOL: January 2024)
- *Ubuntu 23.10 (Mantic Minotaur)* (EOL: July 2024)
- **Ubuntu 24.04 (Noble Numbat)** (EOL: Apr 2029)
- *Ubuntu 24.10 (Oracular Oriole)* (EOL: Jul 2025)
+- Debian 12 (Bookworm) (EOL: tba.)
+- Ubuntu 22.10 (Kinetic Kudu) (EOL: July 20, 2023)
+- Ubuntu 23.04 (Lunar Lobster) (EOL: January 2024)
+- Ubuntu 23.10 (Mantic Minotaur) (EOL: July 2024)
+- Ubuntu 24.04 (Noble Numbat) (EOL: April 2036)

 Not working with:

@ -392,13 +392,6 @@ Now you have to edit `/etc/default/fastapi-dls` as needed.

 Continue [here](#unraid-guest) for docker guest setup.

-## NixOS
-
-Tanks to [@mrzenc](https://github.com/mrzenc) for [fastapi-dls-nixos](https://github.com/mrzenc/fastapi-dls-nixos).
-
-> [!note] Native NixOS-Package
-> There is a [pull request](https://github.com/NixOS/nixpkgs/pull/358647) which adds fastapi-dls into nixpkgs.
-
 ## Let's Encrypt Certificate (optional)

 If you're using installation via docker, you can use `traefik`. Please refer to their documentation.
@ -422,7 +415,6 @@ After first success you have to replace `--issue` with `--renew`.
 | `DEBUG`                | `false`                                | Toggles `fastapi` debug mode                                                                         |
 | `DLS_URL`              | `localhost`                            | Used in client-token to tell guest driver where dls instance is reachable                            |
 | `DLS_PORT`             | `443`                                  | Used in client-token to tell guest driver where dls instance is reachable                            |
-| `CERT_PATH`            | `None`                                 | Path to a Directory where generated Certificates are stored. Defaults to `/<app-dir>/cert`.          |
 | `TOKEN_EXPIRE_DAYS`    | `1`                                    | Client auth-token validity (used for authenticate client against api, **not `.tok` file!**)          |
 | `LEASE_EXPIRE_DAYS`    | `90`                                   | Lease time in days                                                                                   |
 | `LEASE_RENEWAL_PERIOD` | `0.15`                                 | The percentage of the lease period that must elapse before a licensed client can renew a license \*1 |
@ -431,6 +423,8 @@ After first success you have to replace `--issue` with `--renew`.
 | `SITE_KEY_XID`         | `00000000-0000-0000-0000-000000000000` | Site identification uuid                                                                             |
 | `INSTANCE_REF`         | `10000000-0000-0000-0000-000000000001` | Instance identification uuid                                                                         |
 | `ALLOTMENT_REF`        | `20000000-0000-0000-0000-000000000001` | Allotment identification uuid                                                                        |
+| `INSTANCE_KEY_RSA`     | `<app-dir>/cert/instance.private.pem`  | Site-wide private RSA key for singing JWTs \*3                                                       |
+| `INSTANCE_KEY_PUB`     | `<app-dir>/cert/instance.public.pem`   | Site-wide public key \*3                                                                             |

 \*1 For example, if the lease period is one day and the renewal period is 20%, the client attempts to renew its license
 every 4.8 hours. If network connectivity is lost, the loss of connectivity is detected during license renewal and the
@ -438,6 +432,8 @@ client has 19.2 hours in which to re-establish connectivity before its license e

 \*2 Always use `https`, since guest-drivers only support secure connections!

+\*3 If you recreate your instance keys you need to **recreate client-token for each guest**!
+
 # Setup (Client)

 **The token file has to be copied! It's not enough to C&P file contents, because there can be special characters.**
@ -536,10 +532,6 @@ Status endpoint, used for *healthcheck*.

 Shows current runtime environment variables and their values.

-**`GET /-/config/root-certificate`**
-
-Returns the Root-Certificate Certificate which is used. This is required for patching `nvidia-gridd` on 18.x releases.
-
 **`GET /-/readme`**

 HTML rendered README.md.
@ -601,21 +593,6 @@ Logs are available in `C:\Users\Public\Documents\Nvidia\LoggingLog.NVDisplay.Con

 # Known Issues

-## Generic
-
-### `Failed to acquire license from <ip> (Info: <license> - Error: The allowed time to process response has expired)`
-
- Did your timezone settings are correct on fastapi-dls **and your guest**?
- Did you download the client-token more than an hour ago?
-
-Please download a new client-token. The guest have to register within an hour after client-token was created.
-
-### `jose.exceptions.JWTError: Signature verification failed.`
-
- Did you recreate any certificate or keypair?
-
-Then you have to download a **new** client-token on each of your guests.
-
 ## Linux

 ### Invalid HTTP request
@ -748,27 +725,26 @@ The error message can safely be ignored (since we have no license limitation :P)

 # vGPU Software Compatibility Matrix

-<details>
-  <summary>Show Table</summary>
-
 Successfully tested with this package versions.

-| FastAPI-DLS Version | vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver |  Release Date |      EOL Date |
-|---------------------|:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:|
-| `2.x`               |    `18.1`     |   **R570**    | `570.133.08`       | `570.133.07` | `572.83`       |    April 2025 |    March 2026 |
-|                     |    `18.0`     |   **R570**    | `570.124.03`       | `570.124.06` | `572.60`       |    March 2025 |    March 2026 |
-| `1.x` & `2.x`       |    `17.6`     |   **R550**    | `550.163.02`       | `550.63.01`  | `553.74`       |    April 2025 |     June 2025 |
-|                     |    `17.5`     |               | `550.144.02`       | `550.144.03` | `553.62`       |  January 2025 |               |
-|                     |    `17.4`     |               | `550.127.06`       | `550.127.05` | `553.24`       |  October 2024 |               |
-|                     |    `17.3`     |               | `550.90.05`        | `550.90.07`  | `552.74`       |     July 2024 |               |
-|                     |    `17.2`     |               | `550.90.05`        | `550.90.07`  | `552.55`       |     June 2024 |               |
-|                     |    `17.1`     |               | `550.54.16`        | `550.54.15`  | `551.78`       |    March 2024 |               |
-|                     |    `17.0`     |   **R550**    | `550.54.10`        | `550.54.14`  | `551.61`       | February 2024 |               |
-| `1.x`               |    `16.10`    |   **R535**    | `535.247.02`       | `535.247.01` | `539.28`       |    April 2025 |     July 2026 |
-| `1.x`               |    `15.4`     |   **R525**    | `525.147.01`       | `525.147.05` | `529.19`       |     June 2023 | December 2023 |
-| `1.x`               |    `14.4`     |   **R510**    | `510.108.03`       | `510.108.03` | `514.08`       | December 2022 | February 2023 |
-
-</details>
+| vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver |  Release Date |      EOL Date |
+|:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:|
+|    `17.4`     |     R550      | `550.127.06`       | `550.127.05` | `553.24`       |  October 2024 | February 2025 |
+|    `17.3`     |     R550      | `550.90.05`        | `550.90.07`  | `552.74`       |     July 2024 |               |
+|    `17.2`     |     R550      | `550.90.05`        | `550.90.07`  | `552.55`       |     June 2024 |               |
+|    `17.1`     |     R550      | `550.54.16`        | `550.54.15`  | `551.78`       |    March 2024 |               |
+|    `17.0`     |     R550      | `550.54.10`        | `550.54.14`  | `551.61`       | February 2024 |               |
+|    `16.8`     |     R535      | `535.216.01`       | `535.216.01` | `538.95`       |  October 2024 |     July 2026 |
+|    `16.7`     |     R535      | `535.183.04`       | `535.183.06` | `538.78`       |     July 2024 |               |
+|    `16.6`     |     R535      | `535.183.04`       | `535.183.01` | `538.67`       |     June 2024 |               |
+|    `16.5`     |     R535      | `535.161.05`       | `535.161.08` | `538.46`       | February 2024 |               |
+|    `16.4`     |     R535      | `535.161.05`       | `535.161.07` | `538.33`       | February 2024 |               |
+|    `16.3`     |     R535      | `535.154.02`       | `535.154.05` | `538.15`       |  January 2024 |               |
+|    `16.2`     |     R535      | `535.129.03`       | `535.129.03` | `537.70`       |  October 2023 |               |
+|    `16.1`     |     R535      | `535.104.06`       | `535.104.05` | `537.13`       |   August 2023 |               |
+|    `16.0`     |     R535      | `535.54.06`        | `535.54.03`  | `536.22`       |     July 2023 |               |
+|    `15.4`     |     R525      | `525.147.01`       | `525.147.05` | `529.19`       |     June 2023 | December 2023 |
+|    `14.4`     |     R510      | `510.108.03`       | `510.108.03` | `514.08`       | December 2022 | February 2023 |

 - https://docs.nvidia.com/grid/index.html
 - https://docs.nvidia.com/grid/gpus-supported-by-vgpu.html
@ -782,14 +758,12 @@ Thanks to vGPU community and all who uses this project and report bugs.

 Special thanks to:

- `samicrusader` who created build file for **ArchLinux**
- `cyrus` who wrote the section for **openSUSE**
- `midi` who wrote the section for **unRAID**
- `polloloco` who wrote the *[NVIDIA vGPU Guide](https://gitlab.com/polloloco/vgpu-proxmox)*
- `DualCoder` who creates the `vgpu_unlock` functionality [vgpu_unlock](https://github.com/DualCoder/vgpu_unlock)
- `Krutav Shah` who wrote the [vGPU_Unlock Wiki](https://docs.google.com/document/d/1pzrWJ9h-zANCtyqRgS7Vzla0Y8Ea2-5z2HEi4X75d2Q/)
- `Wim van 't Hoog` for the [Proxmox All-In-One Installer Script](https://wvthoog.nl/proxmox-vgpu-v3/)
- `mrzenc` who wrote [fastapi-dls-nixos](https://github.com/mrzenc/fastapi-dls-nixos)
- `electricsheep49` who wrote [gridd-unlock-patcher](https://git.collinwebdesigns.de/oscar.krause/gridd-unlock-patcher)
+- @samicrusader who created build file for **ArchLinux**
+- @cyrus who wrote the section for **openSUSE**
+- @midi who wrote the section for **unRAID**
+- @polloloco who wrote the *[NVIDIA vGPU Guide](https://gitlab.com/polloloco/vgpu-proxmox)*
+- @DualCoder who creates the `vgpu_unlock` functionality [vgpu_unlock](https://github.com/DualCoder/vgpu_unlock)
+- Krutav Shah who wrote the [vGPU_Unlock Wiki](https://docs.google.com/document/d/1pzrWJ9h-zANCtyqRgS7Vzla0Y8Ea2-5z2HEi4X75d2Q/)
+- Wim van 't Hoog for the [Proxmox All-In-One Installer Script](https://wvthoog.nl/proxmox-vgpu-v3/)

 And thanks to all people who contributed to all these libraries!
--- a/app/main.py
+++ b/app/main.py
@ -2,27 +2,26 @@ import logging
 from base64 import b64encode as b64enc
 from calendar import timegm
 from contextlib import asynccontextmanager
-from datetime import datetime, timedelta, UTC
+from datetime import datetime, timedelta
 from hashlib import sha256
-from json import loads as json_loads, dumps as json_dumps
+from json import loads as json_loads
 from os import getenv as env
 from os.path import join, dirname
-from textwrap import wrap
 from uuid import uuid4

 from dateutil.relativedelta import relativedelta
 from dotenv import load_dotenv
 from fastapi import FastAPI
 from fastapi.requests import Request
-from fastapi.responses import Response, RedirectResponse, StreamingResponse
 from jose import jws, jwk, jwt, JWTError
 from jose.constants import ALGORITHMS
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from starlette.middleware.cors import CORSMiddleware
+from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse

 from orm import Origin, Lease, init as db_init, migrate
-from util import CASetup, PrivateKey, Cert, ProductMapping, load_file
+from util import load_key, load_file

 # Load variables
 load_dotenv('../version.env')
@ -40,31 +39,20 @@ db_init(db), migrate(db)
 # Load DLS variables (all prefixed with "INSTANCE_*" is used as "SERVICE_INSTANCE_*" or "SI_*" in official dls service)
 DLS_URL = str(env('DLS_URL', 'localhost'))
 DLS_PORT = int(env('DLS_PORT', '443'))
-CERT_PATH = str(env('CERT_PATH', None))
 SITE_KEY_XID = str(env('SITE_KEY_XID', '00000000-0000-0000-0000-000000000000'))
 INSTANCE_REF = str(env('INSTANCE_REF', '10000000-0000-0000-0000-000000000001'))
 ALLOTMENT_REF = str(env('ALLOTMENT_REF', '20000000-0000-0000-0000-000000000001'))
+INSTANCE_KEY_RSA = load_key(str(env('INSTANCE_KEY_RSA', join(dirname(__file__), 'cert/instance.private.pem'))))
+INSTANCE_KEY_PUB = load_key(str(env('INSTANCE_KEY_PUB', join(dirname(__file__), 'cert/instance.public.pem'))))
 TOKEN_EXPIRE_DELTA = relativedelta(days=int(env('TOKEN_EXPIRE_DAYS', 1)), hours=int(env('TOKEN_EXPIRE_HOURS', 0)))
 LEASE_EXPIRE_DELTA = relativedelta(days=int(env('LEASE_EXPIRE_DAYS', 90)), hours=int(env('LEASE_EXPIRE_HOURS', 0)))
 LEASE_RENEWAL_PERIOD = float(env('LEASE_RENEWAL_PERIOD', 0.15))
 LEASE_RENEWAL_DELTA = timedelta(days=int(env('LEASE_EXPIRE_DAYS', 90)), hours=int(env('LEASE_EXPIRE_HOURS', 0)))
 CLIENT_TOKEN_EXPIRE_DELTA = relativedelta(years=12)
 CORS_ORIGINS = str(env('CORS_ORIGINS', '')).split(',') if (env('CORS_ORIGINS')) else [f'https://{DLS_URL}']
-DT_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'
-PRODUCT_MAPPING = ProductMapping(filename=join(dirname(__file__), 'static/product_mapping.json'))

-# Create certificate chain and signing keys
-ca_setup = CASetup(service_instance_ref=INSTANCE_REF, cert_path=CERT_PATH)
-my_root_private_key = PrivateKey.from_file(ca_setup.root_private_key_filename)
-my_root_public_key = my_root_private_key.public_key()
-my_root_certificate = Cert.from_file(ca_setup.root_certificate_filename)
-my_ca_certificate = Cert.from_file(ca_setup.ca_certificate_filename)
-my_si_certificate = Cert.from_file(ca_setup.si_certificate_filename)
-my_si_private_key = PrivateKey.from_file(ca_setup.si_private_key_filename)
-my_si_public_key = my_si_private_key.public_key()
-
-jwt_encode_key = jwk.construct(my_si_private_key.pem(), algorithm=ALGORITHMS.RS256)
-jwt_decode_key = jwk.construct(my_si_private_key.public_key().pem(), algorithm=ALGORITHMS.RS256)
+jwt_encode_key = jwk.construct(INSTANCE_KEY_RSA.export_key().decode('utf-8'), algorithm=ALGORITHMS.RS256)
+jwt_decode_key = jwk.construct(INSTANCE_KEY_PUB.export_key().decode('utf-8'), algorithm=ALGORITHMS.RS256)

 # Logging
 LOG_LEVEL = logging.DEBUG if DEBUG else logging.INFO
@ -131,12 +119,12 @@ async def _index():

@app.get('/-/health', summary='* Health')
 async def _health():
-    return Response(content=json_dumps({'status': 'up'}), media_type='application/json', status_code=200)
+    return JSONr({'status': 'up'})


@app.get('/-/config', summary='* Config', description='returns environment variables.')
 async def _config():
-    response = {
+    return JSONr({
        'VERSION': str(VERSION),
        'COMMIT': str(COMMIT),
        'DEBUG': str(DEBUG),
@ -150,22 +138,14 @@ async def _config():
        'LEASE_RENEWAL_PERIOD': str(LEASE_RENEWAL_PERIOD),
        'CORS_ORIGINS': str(CORS_ORIGINS),
        'TZ': str(TZ),
-    }
-
-    return Response(content=json_dumps(response), media_type='application/json', status_code=200)
-
-
-@app.get('/-/config/root-certificate', summary='* Root Certificate', description='returns Root--Certificate needed for patching nvidia-gridd')
-async def _config():
-    return Response(content=my_root_certificate.pem().decode('utf-8').strip(), media_type='text/plain')
+    })


@app.get('/-/readme', summary='* Readme')
 async def _readme():
    from markdown import markdown
    content = load_file(join(dirname(__file__), '../README.md')).decode('utf-8')
-    response = markdown(text=content, extensions=['tables', 'fenced_code', 'md_in_html', 'nl2br', 'toc'])
-    return Response(response, media_type='text/html', status_code=200)
+    return HTMLr(markdown(text=content, extensions=['tables', 'fenced_code', 'md_in_html', 'nl2br', 'toc']))


@app.get('/-/manage', summary='* Management UI')
@ -203,7 +183,7 @@ async def _manage(request: Request):
        </body>
    </html>
    '''
-    return Response(response, media_type='text/html', status_code=200)
+    return HTMLr(response)


@app.get('/-/origins', summary='* Origins')
@ -217,7 +197,7 @@ async def _origins(request: Request, leases: bool = False):
            x['leases'] = list(map(lambda _: _.serialize(**serialize), Lease.find_by_origin_ref(db, origin.origin_ref)))
        response.append(x)
    session.close()
-    return Response(content=json_dumps(response), media_type='application/json', status_code=200)
+    return JSONr(response)


@app.delete('/-/origins', summary='* Origins')
@ -239,7 +219,7 @@ async def _leases(request: Request, origin: bool = False):
                x['origin'] = lease_origin.serialize()
        response.append(x)
    session.close()
-    return Response(content=json_dumps(response), media_type='application/json', status_code=200)
+    return JSONr(response)


@app.delete('/-/leases/expired', summary='* Leases')
@ -252,14 +232,13 @@ async def _lease_delete_expired(request: Request):
 async def _lease_delete(request: Request, lease_ref: str):
    if Lease.delete(db, lease_ref) == 1:
        return Response(status_code=201)
-    response = {'status': 404, 'detail': 'lease not found'}
-    return Response(content=json_dumps(response), media_type='application/json', status_code=404)
+    return JSONr(status_code=404, content={'status': 404, 'detail': 'lease not found'})


 # venv/lib/python3.9/site-packages/nls_core_service_instance/service_instance_token_manager.py
@app.get('/-/client-token', summary='* Client-Token', description='creates a new messenger token for this service instance')
 async def _client_token():
-    cur_time = datetime.now(UTC)
+    cur_time = datetime.utcnow()
    exp_time = cur_time + CLIENT_TOKEN_EXPIRE_DELTA

    payload = {
@ -269,7 +248,6 @@ async def _client_token():
        "iat": timegm(cur_time.timetuple()),
        "nbf": timegm(cur_time.timetuple()),
        "exp": timegm(exp_time.timetuple()),
-        "protocol_version": "2.0",
        "update_mode": "ABSOLUTE",
        "scope_ref_list": [ALLOTMENT_REF],
        "fulfillment_class_ref_list": [],
@ -279,7 +257,6 @@ async def _client_token():
                {
                    "idx": 0,
                    "d_name": "DLS",
-                    # todo: {"service": "quick_release", "port": 80} - see "shutdown for windows"
                    "svc_port_map": [{"service": "auth", "port": DLS_PORT}, {"service": "lease", "port": DLS_PORT}]
                }
            ],
@ -287,10 +264,10 @@ async def _client_token():
        },
        "service_instance_public_key_configuration": {
            "service_instance_public_key_me": {
-                "mod": my_si_public_key.mod(),
-                "exp": my_si_public_key.exp(),
+                "mod": hex(INSTANCE_KEY_PUB.public_key().n)[2:],
+                "exp": int(INSTANCE_KEY_PUB.public_key().e),
            },
-            "service_instance_public_key_pem": my_si_public_key.pem().decode('utf-8').strip(),
+            "service_instance_public_key_pem": INSTANCE_KEY_PUB.export_key().decode('utf-8'),
            "key_retention_mode": "LATEST_ONLY"
        },
    }
@ -307,10 +284,10 @@ async def _client_token():
 # venv/lib/python3.9/site-packages/nls_services_auth/test/test_origins_controller.py
@app.post('/auth/v1/origin', description='find or create an origin')
 async def auth_v1_origin(request: Request):
-    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.now(UTC)
+    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.utcnow()

    origin_ref = j.get('candidate_origin_ref')
-    logger.info(f'> [  origin  ]: {origin_ref}: {j}')
+    logging.info(f'> [  origin  ]: {origin_ref}: {j}')

    data = Origin(
        origin_ref=origin_ref,
@ -321,31 +298,26 @@ async def auth_v1_origin(request: Request):

    Origin.create_or_update(db, data)

-    environment = {
-        'raw_env': j.get('environment')
-    }
-    environment.update(j.get('environment'))
-
    response = {
        "origin_ref": origin_ref,
-        "environment": environment,
+        "environment": j.get('environment'),
        "svc_port_set_list": None,
        "node_url_list": None,
        "node_query_order": None,
        "prompts": None,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT)
+        "sync_timestamp": cur_time.isoformat()
    }

-    return Response(content=json_dumps(response, separators=(',', ':')), media_type='application/json', status_code=200)
+    return JSONr(response)


 # venv/lib/python3.9/site-packages/nls_services_auth/test/test_origins_controller.py
@app.post('/auth/v1/origin/update', description='update an origin evidence')
 async def auth_v1_origin_update(request: Request):
-    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.now(UTC)
+    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.utcnow()

    origin_ref = j.get('origin_ref')
-    logger.info(f'> [  update  ]: {origin_ref}: {j}')
+    logging.info(f'> [  update  ]: {origin_ref}: {j}')

    data = Origin(
        origin_ref=origin_ref,
@ -359,20 +331,20 @@ async def auth_v1_origin_update(request: Request):
    response = {
        "environment": j.get('environment'),
        "prompts": None,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT)
+        "sync_timestamp": cur_time.isoformat()
    }

-    return Response(content=json_dumps(response, separators=(',', ':')), media_type='application/json', status_code=200)
+    return JSONr(response)


 # venv/lib/python3.9/site-packages/nls_services_auth/test/test_auth_controller.py
 # venv/lib/python3.9/site-packages/nls_core_auth/auth.py - CodeResponse
@app.post('/auth/v1/code', description='get an authorization code')
 async def auth_v1_code(request: Request):
-    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.now(UTC)
+    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.utcnow()

    origin_ref = j.get('origin_ref')
-    logger.info(f'> [   code   ]: {origin_ref}: {j}')
+    logging.info(f'> [   code   ]: {origin_ref}: {j}')

    delta = relativedelta(minutes=15)
    expires = cur_time + delta
@ -390,33 +362,31 @@ async def auth_v1_code(request: Request):

    response = {
        "auth_code": auth_code,
-        "prompts": None,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT),
+        "sync_timestamp": cur_time.isoformat(),
+        "prompts": None
    }

-    return Response(content=json_dumps(response, separators=(',', ':')), media_type='application/json', status_code=200)
+    return JSONr(response)


 # venv/lib/python3.9/site-packages/nls_services_auth/test/test_auth_controller.py
 # venv/lib/python3.9/site-packages/nls_core_auth/auth.py - TokenResponse
@app.post('/auth/v1/token', description='exchange auth code and verifier for token')
 async def auth_v1_token(request: Request):
-    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.now(UTC)
+    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.utcnow()

    try:
-        payload = jwt.decode(token=j.get('auth_code'), key=jwt_decode_key, algorithms=ALGORITHMS.RS256)
+        payload = jwt.decode(token=j.get('auth_code'), key=jwt_decode_key)
    except JWTError as e:
-        response = {'status': 400, 'title': 'invalid token', 'detail': str(e)}
-        return Response(content=json_dumps(response), media_type='application/json', status_code=400)
+        return JSONr(status_code=400, content={'status': 400, 'title': 'invalid token', 'detail': str(e)})

    origin_ref = payload.get('origin_ref')
-    logger.info(f'> [   auth   ]: {origin_ref}: {j}')
+    logging.info(f'> [   auth   ]: {origin_ref}: {j}')

    # validate the code challenge
    challenge = b64enc(sha256(j.get('code_verifier').encode('utf-8')).digest()).rstrip(b'=').decode('utf-8')
    if payload.get('challenge') != challenge:
-        response = {'status': 401, 'detail': 'expected challenge did not match verifier'}
-        return Response(content=json_dumps(response), media_type='application/json', status_code=401)
+        return JSONr(status_code=401, content={'status': 401, 'detail': 'expected challenge did not match verifier'})

    access_expires_on = cur_time + TOKEN_EXPIRE_DELTA

@ -426,280 +396,167 @@ async def auth_v1_token(request: Request):
        'iss': 'https://cls.nvidia.org',
        'aud': 'https://cls.nvidia.org',
        'exp': timegm(access_expires_on.timetuple()),
+        'origin_ref': origin_ref,
        'key_ref': SITE_KEY_XID,
        'kid': SITE_KEY_XID,
-        'origin_ref': origin_ref,
    }

    auth_token = jwt.encode(new_payload, key=jwt_encode_key, headers={'kid': payload.get('kid')}, algorithm=ALGORITHMS.RS256)

    response = {
+        "expires": access_expires_on.isoformat(),
        "auth_token": auth_token,
-        "expires": access_expires_on.strftime(DT_FORMAT),
-        "prompts": None,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT),
+        "sync_timestamp": cur_time.isoformat(),
    }

-    return Response(content=json_dumps(response, separators=(',', ':')), media_type='application/json', status_code=200)
-
-
-# NLS 3.4.0 - venv/lib/python3.12/site-packages/nls_services_lease/test/test_lease_single_controller.py
-@app.post('/leasing/v1/config-token', description='request to get config token for lease operations')
-async def leasing_v1_config_token(request: Request):
-    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.now(UTC)
-
-    cur_time = datetime.now(UTC)
-    exp_time = cur_time + CLIENT_TOKEN_EXPIRE_DELTA
-
-    payload = {
-        "iss": "NLS Service Instance",
-        "aud": "NLS Licensed Client",
-        "iat": timegm(cur_time.timetuple()),
-        "nbf": timegm(cur_time.timetuple()),
-        "exp": timegm(exp_time.timetuple()),
-        "protocol_version": "2.0",
-        "d_name": "DLS",
-        "service_instance_ref": j.get('service_instance_ref'),
-        "service_instance_public_key_configuration": {
-            "service_instance_public_key_me": {
-                "mod": my_si_public_key.mod(),
-                "exp": my_si_public_key.exp(),
-            },
-            "service_instance_public_key_pem": my_si_public_key.pem().decode('utf-8').strip(),
-            "key_retention_mode": "LATEST_ONLY"
-        },
-    }
-
-    my_jwt_encode_key = jwk.construct(my_si_private_key.pem().decode('utf-8'), algorithm=ALGORITHMS.RS256)
-    config_token = jws.sign(payload, key=my_jwt_encode_key, headers=None, algorithm=ALGORITHMS.RS256)
-
-    response_ca_chain = my_ca_certificate.pem().decode('utf-8').strip()
-
-    # 76 chars per line on original response with "\r\n"
-    """
-    response_ca_chain = my_ca_certificate.pem().decode('utf-8').strip()
-    response_ca_chain = response_ca_chain.replace('-----BEGIN CERTIFICATE-----', '')
-    response_ca_chain = response_ca_chain.replace('-----END CERTIFICATE-----', '')
-    response_ca_chain = response_ca_chain.replace('\n', '')
-    response_ca_chain = wrap(response_ca_chain, 76)
-    response_ca_chain = '\r\n'.join(response_ca_chain)
-    response_ca_chain = f'-----BEGIN CERTIFICATE-----\r\n{response_ca_chain}\r\n-----END CERTIFICATE-----'
-    """
-    response_si_certificate = my_si_certificate.pem().decode('utf-8').strip()
-
-    # 76 chars per line on original response with "\r\n"
-    """
-    response_si_certificate = my_si_certificate.pem().decode('utf-8').strip()
-    response_si_certificate = response_si_certificate.replace('-----BEGIN CERTIFICATE-----', '')
-    response_si_certificate = response_si_certificate.replace('-----END CERTIFICATE-----', '')
-    response_si_certificate = response_si_certificate.replace('\n', '')
-    response_si_certificate = wrap(response_si_certificate, 76)
-    response_si_certificate = '\r\n'.join(response_si_certificate)
-    """
-
-    response = {
-        "certificateConfiguration": {
-            "caChain": [response_ca_chain],
-            "publicCert": response_si_certificate,
-            "publicKey": {
-                "exp": my_si_certificate.public_key().exp(),
-                "mod": [my_si_certificate.public_key().mod()],
-            },
-        },
-        "configToken": config_token,
-    }
-
-    return Response(content=json_dumps(response, separators=(',', ':')), media_type='application/json', status_code=200)
+    return JSONr(response)


 # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py
@app.post('/leasing/v1/lessor', description='request multiple leases (borrow) for current origin')
 async def leasing_v1_lessor(request: Request):
-    j, token, cur_time = json_loads((await request.body()).decode('utf-8')), __get_token(request), datetime.now(UTC)
+    j, token, cur_time = json_loads((await request.body()).decode('utf-8')), __get_token(request), datetime.utcnow()

    try:
        token = __get_token(request)
    except JWTError:
-        response = {'status': 401, 'detail': 'token is not valid'}
-        return Response(content=json_dumps(response), media_type='application/json', status_code=401)
+        return JSONr(status_code=401, content={'status': 401, 'detail': 'token is not valid'})

    origin_ref = token.get('origin_ref')
    scope_ref_list = j.get('scope_ref_list')
-    lease_proposal_list = j.get('lease_proposal_list')
-    logger.info(f'> [  create  ]: {origin_ref}: create leases for scope_ref_list {scope_ref_list}')
-
-    for scope_ref in scope_ref_list:
-        # if scope_ref not in [ALLOTMENT_REF]:
-        #     response = {'status': 400, 'detail': f'service instances not found for scopes: ["{scope_ref}"]')}
-        #     return Response(content=json_dumps(response), media_type='application/json', status_code=400)
-        pass
+    logging.info(f'> [  create  ]: {origin_ref}: create leases for scope_ref_list {scope_ref_list}')

    lease_result_list = []
-    for lease_proposal in lease_proposal_list:
+    for scope_ref in scope_ref_list:
+        # if scope_ref not in [ALLOTMENT_REF]:
+        #     return JSONr(status_code=500, detail=f'no service instances found for scopes: ["{scope_ref}"]')
+
        lease_ref = str(uuid4())
        expires = cur_time + LEASE_EXPIRE_DELTA
-
-        product_name = lease_proposal.get('product').get('name')
-        feature_name = PRODUCT_MAPPING.get_feature_name(product_name=product_name)
-
        lease_result_list.append({
-            "error": None,
+            "ordinal": 0,
+            # https://docs.nvidia.com/license-system/latest/nvidia-license-system-user-guide/index.html
            "lease": {
-                "created": cur_time.strftime(DT_FORMAT),
-                "expires": expires.strftime(DT_FORMAT),  # todo: lease_proposal.get('duration') => "P0Y0M0DT12H0M0S
-                "feature_name": feature_name,
-                "lease_intent_id": None,
-                "license_type": "CONCURRENT_COUNTED_SINGLE",
-                "metadata": None,
-                "offline_lease": False,  # todo
-                "product_name": product_name,
-                "recommended_lease_renewal": LEASE_RENEWAL_PERIOD,
                "ref": lease_ref,
-            },
-            "ordinal": None,
+                "created": cur_time.isoformat(),
+                "expires": expires.isoformat(),
+                "recommended_lease_renewal": LEASE_RENEWAL_PERIOD,
+                "offline_lease": "true",
+                "license_type": "CONCURRENT_COUNTED_SINGLE"
+            }
        })

        data = Lease(origin_ref=origin_ref, lease_ref=lease_ref, lease_created=cur_time, lease_expires=expires)
        Lease.create_or_update(db, data)

    response = {
-        "client_challenge": j.get('client_challenge'),
        "lease_result_list": lease_result_list,
-        "prompts": None,
-        "result_code": None,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT),
+        "result_code": "SUCCESS",
+        "sync_timestamp": cur_time.isoformat(),
+        "prompts": None
    }

-    content = json_dumps(response, separators=(',', ':'))
-    content = f'{content}\n'.encode('ascii')
-    signature = my_si_private_key.generate_signature(content)
-
-    headers = {
-        'Content-Type': 'application/json',
-        'access-control-expose-headers': 'X-NLS-Signature',
-        'X-NLS-Signature': f'{signature.hex().encode()}'
-    }
-
-    return Response(content=content, media_type='application/json', headers=headers)
+    return JSONr(response)


 # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py
 # venv/lib/python3.9/site-packages/nls_dal_service_instance_dls/schema/service_instance/V1_0_21__product_mapping.sql
@app.get('/leasing/v1/lessor/leases', description='get active leases for current origin')
 async def leasing_v1_lessor_lease(request: Request):
-    token, cur_time = __get_token(request), datetime.now(UTC)
+    token, cur_time = __get_token(request), datetime.utcnow()

    origin_ref = token.get('origin_ref')

    active_lease_list = list(map(lambda x: x.lease_ref, Lease.find_by_origin_ref(db, origin_ref)))
-    logger.info(f'> [  leases  ]: {origin_ref}: found {len(active_lease_list)} active leases')
+    logging.info(f'> [  leases  ]: {origin_ref}: found {len(active_lease_list)} active leases')

    response = {
        "active_lease_list": active_lease_list,
-        "prompts": None,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT),
+        "sync_timestamp": cur_time.isoformat(),
+        "prompts": None
    }

-    return Response(content=json_dumps(response, separators=(',', ':')), media_type='application/json', status_code=200)
+    return JSONr(response)


 # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_single_controller.py
 # venv/lib/python3.9/site-packages/nls_core_lease/lease_single.py
@app.put('/leasing/v1/lease/{lease_ref}', description='renew a lease')
 async def leasing_v1_lease_renew(request: Request, lease_ref: str):
-    j, token, cur_time = json_loads((await request.body()).decode('utf-8')), __get_token(request), datetime.now(UTC)
+    token, cur_time = __get_token(request), datetime.utcnow()

    origin_ref = token.get('origin_ref')
-    logger.info(f'> [  renew   ]: {origin_ref}: renew {lease_ref}')
+    logging.info(f'> [  renew   ]: {origin_ref}: renew {lease_ref}')

    entity = Lease.find_by_origin_ref_and_lease_ref(db, origin_ref, lease_ref)
    if entity is None:
-        response = {'status': 404, 'detail': 'requested lease not available'}
-        return Response(content=json_dumps(response), media_type='application/json', status_code=404)
+        return JSONr(status_code=404, content={'status': 404, 'detail': 'requested lease not available'})

    expires = cur_time + LEASE_EXPIRE_DELTA
    response = {
-        "client_challenge": j.get('client_challenge'),
-        "expires": expires.strftime('%Y-%m-%dT%H:%M:%S.%f'),  # DT_FORMAT => "trailing 'Z' missing in this response
-        "feature_expired": False,
        "lease_ref": lease_ref,
-        "metadata": None,
-        "offline_lease": False,  # todo
-        "prompts": None,
+        "expires": expires.isoformat(),
        "recommended_lease_renewal": LEASE_RENEWAL_PERIOD,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT),
+        "offline_lease": True,
+        "prompts": None,
+        "sync_timestamp": cur_time.isoformat(),
    }

    Lease.renew(db, entity, expires, cur_time)

-    content = json_dumps(response, separators=(',', ':'))
-    content = f'{content}\n'.encode('ascii')
-    signature = my_si_private_key.generate_signature(content)
-
-    headers = {
-        'Content-Type': 'application/json',
-        'access-control-expose-headers': 'X-NLS-Signature',
-        'X-NLS-Signature': f'{signature.hex().encode()}'
-    }
-
-    return Response(content=content, media_type='application/json', headers=headers)
-
+    return JSONr(response)


 # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_single_controller.py
@app.delete('/leasing/v1/lease/{lease_ref}', description='release (return) a lease')
 async def leasing_v1_lease_delete(request: Request, lease_ref: str):
-    token, cur_time = __get_token(request), datetime.now(UTC)
+    token, cur_time = __get_token(request), datetime.utcnow()

    origin_ref = token.get('origin_ref')
-    logger.info(f'> [  return  ]: {origin_ref}: return {lease_ref}')
+    logging.info(f'> [  return  ]: {origin_ref}: return {lease_ref}')

    entity = Lease.find_by_lease_ref(db, lease_ref)
    if entity.origin_ref != origin_ref:
-        response = {'status': 403, 'detail': 'access or operation forbidden'}
-        return Response(content=json_dumps(response), media_type='application/json', status_code=403)
+        return JSONr(status_code=403, content={'status': 403, 'detail': 'access or operation forbidden'})
    if entity is None:
-        response = {'status': 404, 'detail': 'requested lease not available'}
-        return Response(content=json_dumps(response), media_type='application/json', status_code=404)
+        return JSONr(status_code=404, content={'status': 404, 'detail': 'requested lease not available'})

    if Lease.delete(db, lease_ref) == 0:
-        response = {'status': 404, 'detail': 'lease not found'}
-        return Response(content=json_dumps(response), media_type='application/json', status_code=404)
+        return JSONr(status_code=404, content={'status': 404, 'detail': 'lease not found'})

    response = {
-        "client_challenge": None,
        "lease_ref": lease_ref,
        "prompts": None,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT),
+        "sync_timestamp": cur_time.isoformat(),
    }

-    return Response(content=json_dumps(response, separators=(',', ':')), media_type='application/json', status_code=200)
+    return JSONr(response)


 # venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py
@app.delete('/leasing/v1/lessor/leases', description='release all leases')
 async def leasing_v1_lessor_lease_remove(request: Request):
-    token, cur_time = __get_token(request), datetime.now(UTC)
+    token, cur_time = __get_token(request), datetime.utcnow()

    origin_ref = token.get('origin_ref')

    released_lease_list = list(map(lambda x: x.lease_ref, Lease.find_by_origin_ref(db, origin_ref)))
    deletions = Lease.cleanup(db, origin_ref)
-    logger.info(f'> [  remove  ]: {origin_ref}: removed {deletions} leases')
+    logging.info(f'> [  remove  ]: {origin_ref}: removed {deletions} leases')

    response = {
        "released_lease_list": released_lease_list,
        "release_failure_list": None,
-        "prompts": None,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT),
+        "sync_timestamp": cur_time.isoformat(),
+        "prompts": None
    }

-    return Response(content=json_dumps(response, separators=(',', ':')), media_type='application/json', status_code=200)
+    return JSONr(response)


@app.post('/leasing/v1/lessor/shutdown', description='shutdown all leases')
 async def leasing_v1_lessor_shutdown(request: Request):
-    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.now(UTC)
+    j, cur_time = json_loads((await request.body()).decode('utf-8')), datetime.utcnow()

    token = j.get('token')
    token = jwt.decode(token=token, key=jwt_decode_key, algorithms=ALGORITHMS.RS256, options={'verify_aud': False})
@ -707,16 +564,16 @@ async def leasing_v1_lessor_shutdown(request: Request):

    released_lease_list = list(map(lambda x: x.lease_ref, Lease.find_by_origin_ref(db, origin_ref)))
    deletions = Lease.cleanup(db, origin_ref)
-    logger.info(f'> [ shutdown ]: {origin_ref}: removed {deletions} leases')
+    logging.info(f'> [ shutdown ]: {origin_ref}: removed {deletions} leases')

    response = {
        "released_lease_list": released_lease_list,
        "release_failure_list": None,
-        "prompts": None,
-        "sync_timestamp": cur_time.strftime(DT_FORMAT),
+        "sync_timestamp": cur_time.isoformat(),
+        "prompts": None
    }

-    return Response(content=json_dumps(response, separators=(',', ':')), media_type='application/json', status_code=200)
+    return JSONr(response)


 if __name__ == '__main__':
@ -730,7 +587,7 @@ if __name__ == '__main__':
    #
    ###

-    logger.info(f'> Starting dev-server ...')
+    logging.info(f'> Starting dev-server ...')

    ssl_keyfile = join(dirname(__file__), 'cert/webserver.key')
    ssl_certfile = join(dirname(__file__), 'cert/webserver.crt')
--- a/app/orm.py
+++ b/app/orm.py
@ -1,11 +1,11 @@
-from datetime import datetime, timedelta, timezone, UTC
+from datetime import datetime, timedelta

 from dateutil.relativedelta import relativedelta
 from sqlalchemy import Column, VARCHAR, CHAR, ForeignKey, DATETIME, update, and_, inspect, text
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker, declarative_base

-from util import DriverMatrix
+from util import NV

 Base = declarative_base()

@ -25,7 +25,7 @@ class Origin(Base):
        return f'Origin(origin_ref={self.origin_ref}, hostname={self.hostname})'

    def serialize(self) -> dict:
-        _ = DriverMatrix().find(self.guest_driver_version)
+        _ = NV().find(self.guest_driver_version)

        return {
            'origin_ref': self.origin_ref,
@ -66,17 +66,7 @@ class Origin(Base):
        if origin_refs is None:
            deletions = session.query(Origin).delete()
        else:
-            deletions = session.query(Origin).filter(Origin.origin_ref.in_(origin_refs)).delete()
-        session.commit()
-        session.close()
-        return deletions
-
-    @staticmethod
-    def delete_expired(engine: Engine) -> int:
-        session = sessionmaker(bind=engine)()
-        origins = session.query(Origin).join(Lease, Origin.origin_ref == Lease.origin_ref, isouter=True).filter(Lease.lease_ref.is_(None)).all()
-        origin_refs = [origin.origin_ref for origin in origins]
-        deletions = session.query(Origin).filter(Origin.origin_ref.in_(origin_refs)).delete()
+            deletions = session.query(Origin).filter(Origin.origin_ref in origin_refs).delete()
        session.commit()
        session.close()
        return deletions
@ -104,10 +94,10 @@ class Lease(Base):
            'lease_ref': self.lease_ref,
            'origin_ref': self.origin_ref,
            # 'scope_ref': self.scope_ref,
-            'lease_created': self.lease_created.replace(tzinfo=timezone.utc).isoformat(),
-            'lease_expires': self.lease_expires.replace(tzinfo=timezone.utc).isoformat(),
-            'lease_updated': self.lease_updated.replace(tzinfo=timezone.utc).isoformat(),
-            'lease_renewal': lease_renewal.replace(tzinfo=timezone.utc).isoformat(),
+            'lease_created': self.lease_created.isoformat(),
+            'lease_expires': self.lease_expires.isoformat(),
+            'lease_updated': self.lease_updated.isoformat(),
+            'lease_renewal': lease_renewal.isoformat(),
        }

    @staticmethod
@ -178,7 +168,7 @@ class Lease(Base):
    @staticmethod
    def delete_expired(engine: Engine) -> int:
        session = sessionmaker(bind=engine)()
-        deletions = session.query(Lease).filter(Lease.lease_expires <= datetime.now(UTC)).delete()
+        deletions = session.query(Lease).filter(Lease.lease_expires <= datetime.utcnow()).delete()
        session.commit()
        session.close()
        return deletions
--- a/app/static/product_mapping.json
+++ b/app/static/product_mapping.json
@ -1,643 +0,0 @@
-{
-  "product": [
-    {
-      "xid": "c0ce7114-d8a5-40d4-b8b0-df204f4ff631",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "NVIDIA-vComputeServer-9.0",
-      "name": "NVIDIA-vComputeServer-9.0",
-      "description": null
-    },
-    {
-      "xid": "2a99638e-493f-424b-bc3a-629935307490",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "vGaming_Flexera_License-0.1",
-      "name": "vGaming_Flexera_License-0.1",
-      "description": null
-    },
-    {
-      "xid": "a013d60c-3cd6-4e61-ae51-018b5e342178",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "GRID-Virtual-Apps-3.0",
-      "name": "GRID-Virtual-Apps-3.0",
-      "description": null
-    },
-    {
-      "xid": "bb99c6a3-81ce-4439-aef5-9648e75dd878",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "GRID-vGaming-NLS-Metered-8.0",
-      "name": "GRID-vGaming-NLS-Metered-8.0",
-      "description": null
-    },
-    {
-      "xid": "c653e131-695c-4477-b77c-42ade3dcb02c",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "GRID-Virtual-WS-Ext-2.0",
-      "name": "GRID-Virtual-WS-Ext-2.0",
-      "description": null
-    },
-    {
-      "xid": "6fc224ef-e0b5-467b-9bbb-d31c9eb7c6fc",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "GRID-vGaming-8.0",
-      "name": "GRID-vGaming-8.0",
-      "description": null
-    },
-    {
-      "xid": "3c88888d-ebf3-4df7-9e86-c97d5b29b997",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "GRID-Virtual-PC-2.0",
-      "name": "GRID-Virtual-PC-2.0",
-      "description": null
-    },
-    {
-      "xid": "66744b41-1fff-49be-a5a6-4cbd71b1117e",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "NVAIE_Licensing-1.0",
-      "name": "NVAIE_Licensing-1.0",
-      "description": null
-    },
-    {
-      "xid": "1d4e9ebc-a78c-41f4-a11a-de38a467b2ba",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "NVIDIA-vComputeServer NLS Metered-9.0",
-      "name": "NVIDIA-vComputeServer NLS Metered-9.0",
-      "description": null
-    },
-    {
-      "xid": "2152f8aa-d17b-46f5-8f5f-6f8c0760ce9c",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "vGaming_FB_License-0.1",
-      "name": "vGaming_FB_License-0.1",
-      "description": null
-    },
-    {
-      "xid": "54cbe0e8-7b35-4068-b058-e11f5b367c66",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "Quadro-Virtual-DWS-5.0",
-      "name": "Quadro-Virtual-DWS-5.0",
-      "description": null
-    },
-    {
-      "xid": "07a1d2b5-c147-48bc-bf44-9390339ca388",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "GRID-Virtual-WS-2.0",
-      "name": "GRID-Virtual-WS-2.0",
-      "description": null
-    },
-    {
-      "xid": "82d7a5f0-0c26-11ef-b3b6-371045c70906",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "vGaming_Flexera_License-0.1",
-      "name": "vGaming_Flexera_License-0.1",
-      "description": null
-    },
-    {
-      "xid": "bdfbde00-2cdb-11ec-9838-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "NVIDIA Virtual Applications",
-      "name": "NVIDIA Virtual Applications",
-      "description": null
-    },
-    {
-      "xid": "bdfbe16d-2cdb-11ec-9838-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "NVIDIA Virtual PC",
-      "name": "NVIDIA Virtual PC",
-      "description": null
-    },
-    {
-      "xid": "bdfbe308-2cdb-11ec-9838-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "NVIDIA RTX Virtual Workstation",
-      "name": "NVIDIA RTX Virtual Workstation",
-      "description": null
-    },
-    {
-      "xid": "bdfbe405-2cdb-11ec-9838-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "NVIDIA vGaming",
-      "name": "NVIDIA vGaming",
-      "description": null
-    },
-    {
-      "xid": "bdfbe509-2cdb-11ec-9838-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "GRID Virtual Applications",
-      "name": "GRID Virtual Applications",
-      "description": null
-    },
-    {
-      "xid": "bdfbe5c6-2cdb-11ec-9838-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "GRID Virtual PC",
-      "name": "GRID Virtual PC",
-      "description": null
-    },
-    {
-      "xid": "bdfbe6e8-2cdb-11ec-9838-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "Quadro Virtual Data Center Workstation",
-      "name": "Quadro Virtual Data Center Workstation",
-      "description": null
-    },
-    {
-      "xid": "bdfbe7c8-2cdb-11ec-9838-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "GRID vGaming",
-      "name": "GRID vGaming",
-      "description": null
-    },
-    {
-      "xid": "bdfbe884-2cdb-11ec-9838-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "NVIDIA Virtual Compute Server",
-      "name": "NVIDIA Virtual Compute Server",
-      "description": null
-    },
-    {
-      "xid": "f09b5c33-5c07-11ed-9fa6-061a22468b59",
-      "product_family_xid": "bda4d909-2cdb-11ec-9838-061a22468b59",
-      "identifier": "NVIDIA OVE Licensing",
-      "name": "NVIDIA Omniverse Nucleus",
-      "description": null
-    }
-  ],
-  "product_fulfillment": [
-    {
-      "xid": "cf0a5330-b583-4d9f-84bb-cfc8ce0917bb",
-      "product_xid": "07a1d2b5-c147-48bc-bf44-9390339ca388",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "90d0f05f-9431-4a15-86e7-740a4f08d457",
-      "product_xid": "1d4e9ebc-a78c-41f4-a11a-de38a467b2ba",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "327385dd-4ba8-4b3c-bc56-30bcf58ae9a3",
-      "product_xid": "2152f8aa-d17b-46f5-8f5f-6f8c0760ce9c",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "6733f2cc-0736-47ee-bcc8-20c4c624ce37",
-      "product_xid": "2a99638e-493f-424b-bc3a-629935307490",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "f35396a9-24f8-44b6-aa6a-493b335f4d56",
-      "product_xid": "3c88888d-ebf3-4df7-9e86-c97d5b29b997",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "6c7981d3-7192-4bfd-b7ec-ea2ad0b466dc",
-      "product_xid": "54cbe0e8-7b35-4068-b058-e11f5b367c66",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "9bd09610-6190-4684-9be6-3d9503833e80",
-      "product_xid": "66744b41-1fff-49be-a5a6-4cbd71b1117e",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "a4282e5b-ea08-4e0a-b724-7f4059ba99de",
-      "product_xid": "6fc224ef-e0b5-467b-9bbb-d31c9eb7c6fc",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "5cf793fc-1fb3-45c0-a711-d3112c775cbe",
-      "product_xid": "a013d60c-3cd6-4e61-ae51-018b5e342178",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "eb2d39a4-6370-4464-8a6a-ec3f42c69cb5",
-      "product_xid": "bb99c6a3-81ce-4439-aef5-9648e75dd878",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "e9df1c70-7fac-4c84-b54c-66e922b9791a",
-      "product_xid": "c0ce7114-d8a5-40d4-b8b0-df204f4ff631",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "6a4d5bcd-7b81-4e22-a289-ce3673e5cabf",
-      "product_xid": "c653e131-695c-4477-b77c-42ade3dcb02c",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "9e162d3c-0c26-11ef-b3b6-371045c70906",
-      "product_xid": "82d7a5f0-0c26-11ef-b3b6-371045c70906",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be2769b9-2cdb-11ec-9838-061a22468b59",
-      "product_xid": "bdfbde00-2cdb-11ec-9838-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be276d7b-2cdb-11ec-9838-061a22468b59",
-      "product_xid": "bdfbe16d-2cdb-11ec-9838-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be276efe-2cdb-11ec-9838-061a22468b59",
-      "product_xid": "bdfbe308-2cdb-11ec-9838-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be276ff0-2cdb-11ec-9838-061a22468b59",
-      "product_xid": "bdfbe405-2cdb-11ec-9838-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be2770af-2cdb-11ec-9838-061a22468b59",
-      "product_xid": "bdfbe509-2cdb-11ec-9838-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be277164-2cdb-11ec-9838-061a22468b59",
-      "product_xid": "bdfbe5c6-2cdb-11ec-9838-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be277214-2cdb-11ec-9838-061a22468b59",
-      "product_xid": "bdfbe6e8-2cdb-11ec-9838-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be2772c8-2cdb-11ec-9838-061a22468b59",
-      "product_xid": "bdfbe7c8-2cdb-11ec-9838-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be277379-2cdb-11ec-9838-061a22468b59",
-      "product_xid": "bdfbe884-2cdb-11ec-9838-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "c4284597-5c09-11ed-9fa6-061a22468b59",
-      "product_xid": "f09b5c33-5c07-11ed-9fa6-061a22468b59",
-      "qualifier_specification": null,
-      "evaluation_order_index": 0
-    }
-  ],
-  "product_fulfillment_feature": [
-    {
-      "xid": "9ca32d2b-736e-4e4f-8f5a-895a755b4c41",
-      "product_fulfillment_xid": "5cf793fc-1fb3-45c0-a711-d3112c775cbe",
-      "feature_identifier": "GRID-Virtual-Apps",
-      "feature_version": "3.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "d8b25329-f47f-43dc-a278-f2d38f9e939b",
-      "product_fulfillment_xid": "f35396a9-24f8-44b6-aa6a-493b335f4d56",
-      "feature_identifier": "GRID-Virtual-PC",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "e7102df8-d88a-4bd0-aa79-9a53d8b77888",
-      "product_fulfillment_xid": "cf0a5330-b583-4d9f-84bb-cfc8ce0917bb",
-      "feature_identifier": "GRID-Virtual-WS",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "30761db3-0afe-454d-b284-efba6d9b13a3",
-      "product_fulfillment_xid": "6a4d5bcd-7b81-4e22-a289-ce3673e5cabf",
-      "feature_identifier": "GRID-Virtual-WS-Ext",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "10fd7701-83ae-4caf-a27f-75880fab23f6",
-      "product_fulfillment_xid": "a4282e5b-ea08-4e0a-b724-7f4059ba99de",
-      "feature_identifier": "GRID-vGaming",
-      "feature_version": "8.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "cbd61276-fb1e-42e1-b844-43e94465da8f",
-      "product_fulfillment_xid": "9bd09610-6190-4684-9be6-3d9503833e80",
-      "feature_identifier": "NVAIE_Licensing",
-      "feature_version": "1.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "6b1c74b5-1511-46ee-9f12-8bc6d5636fef",
-      "product_fulfillment_xid": "90d0f05f-9431-4a15-86e7-740a4f08d457",
-      "feature_identifier": "NVIDIA-vComputeServer NLS Metered",
-      "feature_version": "9.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "db53af09-7295-48b7-b927-24b23690c959",
-      "product_fulfillment_xid": "e9df1c70-7fac-4c84-b54c-66e922b9791a",
-      "feature_identifier": "NVIDIA-vComputeServer",
-      "feature_version": "9.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "1f62be61-a887-4e54-a34e-61cfa7b2db30",
-      "product_fulfillment_xid": "6c7981d3-7192-4bfd-b7ec-ea2ad0b466dc",
-      "feature_identifier": "Quadro-Virtual-DWS",
-      "feature_version": "5.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "8a4b5e98-f1ca-4c18-b0d4-8f4f9f0462e2",
-      "product_fulfillment_xid": "327385dd-4ba8-4b3c-bc56-30bcf58ae9a3",
-      "feature_identifier": "vGaming_FB_License",
-      "feature_version": "0.1",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be531e98-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be2769b9-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-Apps",
-      "feature_version": "3.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be53219e-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be276d7b-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-PC",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be5322f0-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be276d7b-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "Quadro-Virtual-DWS",
-      "feature_version": "5.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 1
-    },
-    {
-      "xid": "be5323d8-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be276d7b-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-WS",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 2
-    },
-    {
-      "xid": "be5324a6-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be276d7b-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-WS-Ext",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 3
-    },
-    {
-      "xid": "be532568-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be276efe-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "Quadro-Virtual-DWS",
-      "feature_version": "5.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be532630-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be276efe-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-WS",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 1
-    },
-    {
-      "xid": "be5326e7-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be276efe-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-WS-Ext",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 2
-    },
-    {
-      "xid": "be5327a7-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be276ff0-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-vGaming",
-      "feature_version": "8.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be532923-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be2770af-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-Apps",
-      "feature_version": "3.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be5329e0-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277164-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-PC",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be532aa0-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277164-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "Quadro-Virtual-DWS",
-      "feature_version": "5.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 1
-    },
-    {
-      "xid": "be532b5c-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277164-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-WS",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 2
-    },
-    {
-      "xid": "be532c19-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277164-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-WS-Ext",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 3
-    },
-    {
-      "xid": "be532ccb-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277214-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "Quadro-Virtual-DWS",
-      "feature_version": "5.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be532d92-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277214-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-WS",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 1
-    },
-    {
-      "xid": "be532e45-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277214-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-Virtual-WS-Ext",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 2
-    },
-    {
-      "xid": "be532efa-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be2772c8-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-vGaming",
-      "feature_version": "8.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be53306d-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "NVIDIA-vComputeServer",
-      "feature_version": "9.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "be533228-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "NVIDIA-vComputeServer NLS Metered",
-      "feature_version": "9.0",
-      "license_type_identifier": "CONCURRENT_UNCOUNTED_SINGLE",
-      "evaluation_order_index": 2
-    },
-    {
-      "xid": "be5332f6-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "NVAIE_Licensing",
-      "feature_version": "1.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 3
-    },
-    {
-      "xid": "15ff4f16-57a8-4593-93ec-58352a256f12",
-      "product_fulfillment_xid": "eb2d39a4-6370-4464-8a6a-ec3f42c69cb5",
-      "feature_identifier": "GRID-vGaming-NLS-Metered",
-      "feature_version": "8.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 3
-    },
-    {
-      "xid": "0c1552ca-3ef8-11ed-9fa6-061a22468b59",
-      "product_fulfillment_xid": "be276ff0-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "vGaming_Flexera_License",
-      "feature_version": "0.1",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 1
-    },
-    {
-      "xid": "31c3be8c-5c0a-11ed-9fa6-061a22468b59",
-      "product_fulfillment_xid": "c4284597-5c09-11ed-9fa6-061a22468b59",
-      "feature_identifier": "OVE_Licensing",
-      "feature_version": "1.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    },
-    {
-      "xid": "6caeb4cf-360f-11ee-b67d-02f279bf2bff",
-      "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "NVAIE_Licensing",
-      "feature_version": "2.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 4
-    },
-    {
-      "xid": "7fb1d01d-3f0e-11ed-9fa6-061a22468b59",
-      "product_fulfillment_xid": "be276ff0-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "vGaming_FB_License",
-      "feature_version": "0.1",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 2
-    },
-    {
-      "xid": "8eabcb08-3f0e-11ed-9fa6-061a22468b59",
-      "product_fulfillment_xid": "be2772c8-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "vGaming_FB_License",
-      "feature_version": "0.1",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 2
-    },
-    {
-      "xid": "a1dfe741-3e49-11ed-9fa6-061a22468b59",
-      "product_fulfillment_xid": "be2772c8-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "vGaming_Flexera_License",
-      "feature_version": "0.1",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 1
-    },
-    {
-      "xid": "be53286a-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be276ff0-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-vGaming-NLS-Metered",
-      "feature_version": "8.0",
-      "license_type_identifier": "CONCURRENT_UNCOUNTED_SINGLE",
-      "evaluation_order_index": 3
-    },
-    {
-      "xid": "be532fb2-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be2772c8-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "GRID-vGaming-NLS-Metered",
-      "feature_version": "8.0",
-      "license_type_identifier": "CONCURRENT_UNCOUNTED_SINGLE",
-      "evaluation_order_index": 3
-    },
-    {
-      "xid": "be533144-2cdb-11ec-9838-061a22468b59",
-      "product_fulfillment_xid": "be277379-2cdb-11ec-9838-061a22468b59",
-      "feature_identifier": "Quadro-Virtual-DWS",
-      "feature_version": "0.0",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 1
-    },
-    {
-      "xid": "bf105e18-0c26-11ef-b3b6-371045c70906",
-      "product_fulfillment_xid": "9e162d3c-0c26-11ef-b3b6-371045c70906",
-      "feature_identifier": "vGaming_Flexera_License",
-      "feature_version": "0.1",
-      "license_type_identifier": "CONCURRENT_COUNTED_SINGLE",
-      "evaluation_order_index": 0
-    }
-  ]
-}
--- a/app/util.py
+++ b/app/util.py
@ -1,17 +1,4 @@
 import logging
-from datetime import datetime, UTC, timedelta
-from json import loads as json_loads
-from os.path import join, dirname, isfile, isdir
-
-from cryptography import x509
-from cryptography.hazmat._oid import NameOID
-from cryptography.hazmat.primitives import serialization, hashes
-from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey, generate_private_key
-from cryptography.hazmat.primitives.hashes import SHA256
-from cryptography.hazmat.primitives.serialization import Encoding
-from cryptography.hazmat.primitives.serialization import load_pem_private_key, load_pem_public_key
-from cryptography.x509 import load_pem_x509_certificate, Certificate

 logging.basicConfig()

@ -24,353 +11,56 @@ def load_file(filename: str) -> bytes:
    return content


-class CASetup:
-    ###
-    #
-    # https://git.collinwebdesigns.de/nvidia/nls/-/blob/main/src/test/test_config_token.py
-    #
-    ###
+def load_key(filename: str) -> "RsaKey":
+    try:
+        # Crypto | Cryptodome on Debian
+        from Crypto.PublicKey import RSA
+        from Crypto.PublicKey.RSA import RsaKey
+    except ModuleNotFoundError:
+        from Cryptodome.PublicKey import RSA
+        from Cryptodome.PublicKey.RSA import RsaKey

-    ROOT_PRIVATE_KEY_FILENAME = 'root_private_key.pem'
-    ROOT_CERTIFICATE_FILENAME = 'root_certificate.pem'
-    CA_PRIVATE_KEY_FILENAME = 'ca_private_key.pem'
-    CA_CERTIFICATE_FILENAME = 'ca_certificate.pem'
-    SI_PRIVATE_KEY_FILENAME = 'si_private_key.pem'
-    SI_CERTIFICATE_FILENAME = 'si_certificate.pem'
-
-    def __init__(self, service_instance_ref: str, cert_path: str = None):
-        cert_path_prefix = join(dirname(__file__), 'cert')
-        if cert_path is not None and len(cert_path) > 0 and isdir(cert_path):
-            cert_path_prefix = cert_path
-
-        self.service_instance_ref = service_instance_ref
-        self.root_private_key_filename = join(cert_path_prefix, CASetup.ROOT_PRIVATE_KEY_FILENAME)
-        self.root_certificate_filename = join(dirname(__file__), 'cert', CASetup.ROOT_CERTIFICATE_FILENAME)
-        self.ca_private_key_filename = join(dirname(__file__), 'cert', CASetup.CA_PRIVATE_KEY_FILENAME)
-        self.ca_certificate_filename = join(dirname(__file__), 'cert', CASetup.CA_CERTIFICATE_FILENAME)
-        self.si_private_key_filename = join(dirname(__file__), 'cert', CASetup.SI_PRIVATE_KEY_FILENAME)
-        self.si_certificate_filename = join(dirname(__file__), 'cert', CASetup.SI_CERTIFICATE_FILENAME)
-
-        if not (isfile(self.root_private_key_filename)
-                and isfile(self.root_certificate_filename)
-                and isfile(self.ca_private_key_filename)
-                and isfile(self.ca_certificate_filename)
-                and isfile(self.si_private_key_filename)
-                and isfile(self.si_certificate_filename)):
-            self.init_config_token_demo()
-
-    def init_config_token_demo(self):
-        """ Create Root Key and Certificate """
-
-        # create root keypair
-        my_root_private_key = generate_private_key(public_exponent=65537, key_size=4096)
-        my_root_public_key = my_root_private_key.public_key()
-
-        # create root-certificate subject
-        my_root_subject = x509.Name([
-            x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'),
-            x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'California'),
-            x509.NameAttribute(NameOID.ORGANIZATION_NAME, u'Nvidia'),
-            x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, u'Nvidia Licensing Service (NLS)'),
-            x509.NameAttribute(NameOID.COMMON_NAME, u'NLS Root CA'),
-        ])
-
-        # create self-signed root-certificate
-        my_root_certificate = (
-            x509.CertificateBuilder()
-            .subject_name(my_root_subject)
-            .issuer_name(my_root_subject)
-            .public_key(my_root_public_key)
-            .serial_number(x509.random_serial_number())
-            .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1))
-            .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10))
-            .add_extension(x509.BasicConstraints(ca=True, path_length=None), critical=True)
-            .add_extension(x509.KeyUsage(
-                digital_signature=False,
-                key_encipherment=False,
-                key_cert_sign=True,
-                key_agreement=False,
-                content_commitment=False,
-                data_encipherment=False,
-                crl_sign=True,
-                encipher_only=False,
-                decipher_only=False),
-                critical=True
-            )
-            .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_root_public_key), critical=False)
-            .add_extension(x509.AuthorityKeyIdentifier.from_issuer_public_key(my_root_public_key), critical=False)
-            .sign(my_root_private_key, hashes.SHA256()))
-
-        my_root_private_key_as_pem = my_root_private_key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.TraditionalOpenSSL,
-            encryption_algorithm=serialization.NoEncryption(),
-        )
-
-        with open(self.root_private_key_filename, 'wb') as f:
-            f.write(my_root_private_key_as_pem)
-
-        with open(self.root_certificate_filename, 'wb') as f:
-            f.write(my_root_certificate.public_bytes(encoding=Encoding.PEM))
-
-        """ Create CA (Intermediate) Key and Certificate """
-
-        # create ca keypair
-        my_ca_private_key = generate_private_key(public_exponent=65537, key_size=4096)
-        my_ca_public_key = my_ca_private_key.public_key()
-
-        # create ca-certificate subject
-        my_ca_subject = x509.Name([
-            x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'),
-            x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'California'),
-            x509.NameAttribute(NameOID.ORGANIZATION_NAME, u'Nvidia'),
-            x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, u'Nvidia Licensing Service (NLS)'),
-            x509.NameAttribute(NameOID.COMMON_NAME, u'NLS Intermediate CA'),
-        ])
-
-        # create self-signed ca-certificate
-        my_ca_certificate = (
-            x509.CertificateBuilder()
-            .subject_name(my_ca_subject)
-            .issuer_name(my_root_subject)
-            .public_key(my_ca_public_key)
-            .serial_number(x509.random_serial_number())
-            .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1))
-            .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10))
-            .add_extension(x509.BasicConstraints(ca=True, path_length=None), critical=True)
-            .add_extension(x509.KeyUsage(
-                digital_signature=False,
-                key_encipherment=False,
-                key_cert_sign=True,
-                key_agreement=False,
-                content_commitment=False,
-                data_encipherment=False,
-                crl_sign=True,
-                encipher_only=False,
-                decipher_only=False),
-                critical=True
-            )
-            .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_ca_public_key), critical=False)
-            .add_extension(x509.AuthorityKeyIdentifier.from_issuer_subject_key_identifier(
-                my_root_certificate.extensions.get_extension_for_class(x509.SubjectKeyIdentifier).value
-            ), critical=False)
-            .sign(my_root_private_key, hashes.SHA256()))
-
-        my_ca_private_key_as_pem = my_ca_private_key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.TraditionalOpenSSL,
-            encryption_algorithm=serialization.NoEncryption(),
-        )
-
-        with open(self.ca_private_key_filename, 'wb') as f:
-            f.write(my_ca_private_key_as_pem)
-
-        with open(self.ca_certificate_filename, 'wb') as f:
-            f.write(my_ca_certificate.public_bytes(encoding=Encoding.PEM))
-
-        """ Create Service-Instance Key and Certificate """
-
-        # create si keypair
-        my_si_private_key = generate_private_key(public_exponent=65537, key_size=2048)
-        my_si_public_key = my_si_private_key.public_key()
-
-        my_si_private_key_as_pem = my_si_private_key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.TraditionalOpenSSL,
-            encryption_algorithm=serialization.NoEncryption(),
-        )
-        my_si_public_key_as_pem = my_si_public_key.public_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PublicFormat.SubjectPublicKeyInfo,
-        )
-
-        with open(self.si_private_key_filename, 'wb') as f:
-            f.write(my_si_private_key_as_pem)
-
-        # with open(self.si_public_key_filename, 'wb') as f:
-        #    f.write(my_si_public_key_as_pem)
-
-        # create si-certificate subject
-        my_si_subject = x509.Name([
-            # x509.NameAttribute(NameOID.COMMON_NAME, INSTANCE_REF),
-            x509.NameAttribute(NameOID.COMMON_NAME, self.service_instance_ref),
-        ])
-
-        # create self-signed si-certificate
-        my_si_certificate = (
-            x509.CertificateBuilder()
-            .subject_name(my_si_subject)
-            .issuer_name(my_ca_subject)
-            .public_key(my_si_public_key)
-            .serial_number(x509.random_serial_number())
-            .not_valid_before(datetime.now(tz=UTC) - timedelta(days=1))
-            .not_valid_after(datetime.now(tz=UTC) + timedelta(days=365 * 10))
-            .add_extension(x509.KeyUsage(digital_signature=True, key_encipherment=True, key_cert_sign=False,
-                                         key_agreement=True, content_commitment=False, data_encipherment=False,
-                                         crl_sign=False, encipher_only=False, decipher_only=False), critical=True)
-            .add_extension(x509.ExtendedKeyUsage([
-                x509.oid.ExtendedKeyUsageOID.SERVER_AUTH,
-                x509.oid.ExtendedKeyUsageOID.CLIENT_AUTH]
-            ), critical=False)
-            .add_extension(x509.SubjectKeyIdentifier.from_public_key(my_si_public_key), critical=False)
-            # .add_extension(x509.AuthorityKeyIdentifier.from_issuer_public_key(my_ca_public_key), critical=False)
-            .add_extension(x509.AuthorityKeyIdentifier.from_issuer_subject_key_identifier(
-                my_ca_certificate.extensions.get_extension_for_class(x509.SubjectKeyIdentifier).value
-            ), critical=False)
-            .add_extension(x509.SubjectAlternativeName([
-                # x509.DNSName(INSTANCE_REF)
-                x509.DNSName(self.service_instance_ref)
-            ]), critical=False)
-            .sign(my_ca_private_key, hashes.SHA256()))
-
-        with open(self.si_certificate_filename, 'wb') as f:
-            f.write(my_si_certificate.public_bytes(encoding=Encoding.PEM))
+    log = logging.getLogger(__name__)
+    log.debug(f'Importing RSA-Key from "{filename}"')
+    return RSA.import_key(extern_key=load_file(filename), passphrase=None)


-class PrivateKey:
-
-    def __init__(self, data: bytes):
-        self.__key = load_pem_private_key(data, password=None)
-
-    @staticmethod
-    def from_file(filename: str) -> "PrivateKey":
-        log = logging.getLogger(__name__)
-        log.debug(f'Importing RSA-Private-Key from "{filename}"')
-
-        with open(filename, 'rb') as f:
-            data = f.read()
-
-        return PrivateKey(data=data.strip())
-
-    def raw(self) -> RSAPrivateKey:
-        return self.__key
-
-    def pem(self) -> bytes:
-        return self.__key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.TraditionalOpenSSL,
-            encryption_algorithm=serialization.NoEncryption()
-        )
-
-    def public_key(self) -> "PublicKey":
-        data = self.__key.public_key().public_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PublicFormat.SubjectPublicKeyInfo
-        )
-        return PublicKey(data=data)
-
-    def generate_signature(self, data: bytes) -> bytes:
-        return self.__key.sign(data=data, padding=PKCS1v15(), algorithm=SHA256())
-
-    @staticmethod
-    def generate(public_exponent: int = 65537, key_size: int = 2048) -> "PrivateKey":
-        log = logging.getLogger(__name__)
-        log.debug(f'Generating RSA-Key')
-        key = generate_private_key(public_exponent=public_exponent, key_size=key_size)
-        data = key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.TraditionalOpenSSL,
-            encryption_algorithm=serialization.NoEncryption()
-        )
-        return PrivateKey(data=data)
+def generate_key() -> "RsaKey":
+    try:
+        # Crypto | Cryptodome on Debian
+        from Crypto.PublicKey import RSA
+        from Crypto.PublicKey.RSA import RsaKey
+    except ModuleNotFoundError:
+        from Cryptodome.PublicKey import RSA
+        from Cryptodome.PublicKey.RSA import RsaKey
+    log = logging.getLogger(__name__)
+    log.debug(f'Generating RSA-Key')
+    return RSA.generate(bits=2048)


-class PublicKey:
-
-    def __init__(self, data: bytes):
-        self.__key = load_pem_public_key(data)
-
-    @staticmethod
-    def from_file(filename: str) -> "PublicKey":
-        log = logging.getLogger(__name__)
-        log.debug(f'Importing RSA-Public-Key from "{filename}"')
-
-        with open(filename, 'rb') as f:
-            data = f.read()
-
-        return PublicKey(data=data.strip())
-
-    def raw(self) -> RSAPublicKey:
-        return self.__key
-
-    def pem(self) -> bytes:
-        return self.__key.public_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PublicFormat.SubjectPublicKeyInfo
-        )
-
-    def mod(self) -> str:
-        return hex(self.__key.public_numbers().n)[2:]
-
-    def exp(self):
-        return int(self.__key.public_numbers().e)
-
-    def verify_signature(self, signature: bytes, data: bytes) -> None:
-        self.__key.verify(signature=signature, data=data, padding=PKCS1v15(), algorithm=SHA256())
-
-
-class Cert:
-
-    def __init__(self, data: bytes):
-        self.__cert = load_pem_x509_certificate(data)
-
-    @staticmethod
-    def from_file(filename: str) -> "Cert":
-        log = logging.getLogger(__name__)
-        log.debug(f'Importing Certificate from "{filename}"')
-
-        with open(filename, 'rb') as f:
-            data = f.read()
-
-        return Cert(data=data.strip())
-
-    def raw(self) -> Certificate:
-        return self.__cert
-
-    def pem(self) -> bytes:
-        return self.__cert.public_bytes(encoding=serialization.Encoding.PEM)
-
-    def public_key(self) -> "PublicKey":
-        data = self.__cert.public_key().public_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PublicFormat.SubjectPublicKeyInfo
-        )
-        return PublicKey(data=data)
-
-    def signature(self) -> bytes:
-        return self.__cert.signature
-
-    def subject_key_identifier(self):
-        return self.__cert.extensions.get_extension_for_class(x509.SubjectKeyIdentifier).value.key_identifier
-
-    def authority_key_identifier(self):
-        return self.__cert.extensions.get_extension_for_class(x509.AuthorityKeyIdentifier).value.key_identifier
-
-
-class DriverMatrix:
+class NV:
    __DRIVER_MATRIX_FILENAME = 'static/driver_matrix.json'
    __DRIVER_MATRIX: None | dict = None  # https://docs.nvidia.com/grid/ => "Driver Versions"

    def __init__(self):
        self.log = logging.getLogger(self.__class__.__name__)

-        if DriverMatrix.__DRIVER_MATRIX is None:
-            self.__load()
-
-    def __load(self):
-        try:
-            with open(DriverMatrix.__DRIVER_MATRIX_FILENAME, 'r') as f:
-                DriverMatrix.__DRIVER_MATRIX = json_loads(f.read())
-            self.log.debug(f'Successfully loaded "{DriverMatrix.__DRIVER_MATRIX_FILENAME}".')
-        except Exception as e:
-            DriverMatrix.__DRIVER_MATRIX = {}  # init empty dict to not try open file everytime, just when restarting app
-            # self.log.warning(f'Failed to load "{NV.__DRIVER_MATRIX_FILENAME}": {e}')
+        if NV.__DRIVER_MATRIX is None:
+            from json import load as json_load
+            try:
+                file = open(NV.__DRIVER_MATRIX_FILENAME)
+                NV.__DRIVER_MATRIX = json_load(file)
+                file.close()
+                self.log.debug(f'Successfully loaded "{NV.__DRIVER_MATRIX_FILENAME}".')
+            except Exception as e:
+                NV.__DRIVER_MATRIX = {}  # init empty dict to not try open file everytime, just when restarting app
+                # self.log.warning(f'Failed to load "{NV.__DRIVER_MATRIX_FILENAME}": {e}')

    @staticmethod
    def find(version: str) -> dict | None:
-        if DriverMatrix.__DRIVER_MATRIX is None:
+        if NV.__DRIVER_MATRIX is None:
            return None
-        for idx, (key, branch) in enumerate(DriverMatrix.__DRIVER_MATRIX.items()):
+        for idx, (key, branch) in enumerate(NV.__DRIVER_MATRIX.items()):
            for release in branch.get('$releases'):
                linux_driver = release.get('Linux Driver')
                windows_driver = release.get('Windows Driver')
@ -390,34 +80,3 @@ class DriverMatrix:
                        'is_latest': is_latest,
                    }
        return None
-
-
-class ProductMapping:
-
-    def __init__(self, filename: str):
-        with open(filename, 'r') as file:
-            self.data = json_loads(file.read())
-
-
-    def get_feature_name(self, product_name: str) -> (str, str):
-        product = self.__get_product(product_name)
-        product_fulfillment = self.__get_product_fulfillment(product.get('xid'))
-        feature = self.__get_product_fulfillment_feature(product_fulfillment.get('xid'))
-
-        return feature.get('feature_identifier')
-
-
-    def __get_product(self, product_name: str):
-        product_list = self.data.get('product')
-        return next(filter(lambda _: _.get('identifier') == product_name, product_list))
-
-
-    def __get_product_fulfillment(self, product_xid: str):
-        product_fulfillment_list = self.data.get('product_fulfillment')
-        return next(filter(lambda _: _.get('product_xid') == product_xid, product_fulfillment_list))
-
-    def __get_product_fulfillment_feature(self, product_fulfillment_xid: str):
-        feature_list = self.data.get('product_fulfillment_feature')
-        features = list(filter(lambda _: _.get('product_fulfillment_xid') == product_fulfillment_xid, feature_list))
-        features.sort(key=lambda _: _.get('evaluation_order_index'))
-        return features[0]
--- a/doc/Database.md
+++ b/doc/Database.md
@ -0,0 +1,26 @@
+# Database structure
+
+## `request_routing.service_instance`
+
+| xid                                    | org_name                 |
+|----------------------------------------|--------------------------|
+| `10000000-0000-0000-0000-000000000000` | `lic-000000000000000000` |
+
+- `xid` is used as `SERVICE_INSTANCE_XID`
+
+## `request_routing.license_allotment_service_instance`
+
+| xid                                    | service_instance_xid                   | license_allotment_xid                  |
+|----------------------------------------|----------------------------------------|----------------------------------------|
+| `90000000-0000-0000-0000-000000000001` | `10000000-0000-0000-0000-000000000000` | `80000000-0000-0000-0000-000000000001` |
+
+- `xid` is only a primary-key and never used as foreign-key or reference
+- `license_allotment_xid` must be used to fetch `xid`'s from `request_routing.license_allotment_reference`
+
+## `request_routing.license_allotment_reference`
+
+| xid                                    | license_allotment_xid                  |
+|----------------------------------------|----------------------------------------|
+| `20000000-0000-0000-0000-000000000001` | `80000000-0000-0000-0000-000000000001` | 
+
+- `xid` is used as `scope_ref_list` on token request
--- a/doc/Reverse
+++ b/doc/Reverse
@ -0,0 +1,177 @@
+# Reverse Engineering Notes
+
+# Usefully commands
+
+## Check licensing status
+
+- `nvidia-smi -q | grep "License"`
+
+**Output**
+
+```
+vGPU Software Licensed Product
+        License Status                    : Licensed (Expiry: 2023-1-14 12:59:52 GMT)
+```
+
+## Track licensing progress
+
+- NVIDIA Grid Log: `journalctl -u nvidia-gridd -f`
+
+```
+systemd[1]: Started NVIDIA Grid Daemon.
+nvidia-gridd[2986]: Configuration parameter ( ServerAddress  ) not set
+nvidia-gridd[2986]: vGPU Software package (0)
+nvidia-gridd[2986]: Ignore service provider and node-locked licensing
+nvidia-gridd[2986]: NLS initialized
+nvidia-gridd[2986]: Acquiring license. (Info: license.nvidia.space; NVIDIA RTX Virtual Workstation)
+nvidia-gridd[2986]: License acquired successfully. (Info: license.nvidia.space, NVIDIA RTX Virtual Workstation; Expiry: 2023-1-29 22:3:0 GMT)
+```
+
+# DLS-Container File-System (Docker)
+
+## Configuration data
+
+Most variables and configs are stored in `/var/lib/docker/volumes/configurations/_data`.
+
+Files can be modified with `docker cp <container-id>:/venv/... /opt/localfile/...` and back.
+(May you need to fix permissions with `docker exec -u 0 <container-id> chown nonroot:nonroot /venv/...`)
+
+## Dive / Docker image inspector
+
+- `dive dls:appliance`
+
+The source code is stored in `/venv/lib/python3.9/site-packages/nls_*`.
+
+Image-Reference:
+
+```
+Tags:   (unavailable)
+Id:     d1c7976a5d2b3681ff6c5a30f8187e4015187a83f3f285ba4a37a45458bd6b98
+Digest: sha256:311223c5af7a298ec1104f5dc8c3019bfb0e1f77256dc3d995244ffb295a97
+1f
+Command:
+#(nop) ADD file:c1900d3e3a29c29a743a8da86c437006ec5d2aa873fb24e48033b6bf492bb37b in /
+```
+
+## Private Key (Site-Key)
+
+- `/etc/dls/config/decryptor/decryptor`
+
+```shell
+ docker exec -it <container-id> /etc/dls/config/decryptor/decryptor > /tmp/private-key.pem
+```
+
+```
+-----BEGIN RSA PRIVATE KEY-----
+...
+-----END RSA PRIVATE KEY-----
+``` 
+
+## Site Key Uri - `/etc/dls/config/site_key_uri.bin`
+
+```
+base64-content...
+```
+
+## DB Password - `/etc/dls/config/dls_db_password.bin`
+
+```
+base64-content...
+```
+
+**Decrypt database password**
+
+```
+cd /var/lib/docker/volumes/configurations/_data
+cat dls_db_password.bin | base64 -d > dls_db_password.bin.raw
+openssl rsautl -decrypt -inkey /tmp/private-key.pem -in dls_db_password.bin.raw
+```
+
+# Database
+
+- It's enough to manipulate database licenses. There must not be changed any line of code to bypass licensing
+  validations.
+
+# Logging / Stack Trace
+
+- https://docs.nvidia.com/license-system/latest/nvidia-license-system-user-guide/index.html#troubleshooting-dls-instance
+
+**Failed licensing log**
+
+```
+{
+    "activity": 100,
+    "context": {
+        "SERVICE_INSTANCE_ID": "b43d6e46-d6d0-4943-8b8d-c66a5f6e0d38",
+        "SERVICE_INSTANCE_NAME": "DEFAULT_2022-12-14_12:48:30",
+        "description": "borrow failed: NotFoundError(no pool features found for: NVIDIA RTX Virtual Workstation)",
+        "event_type": null,
+        "function_name": "_evt",
+        "lineno": 54,
+        "module_name": "nls_dal_lease_dls.event",
+        "operation_id": "e72a8ca7-34cc-4e11-b80c-273592085a24",
+        "origin_ref": "3f7f5a50-a26b-425b-8d5e-157f63e72b1c",
+        "service_name": "nls_services_lease"
+    },
+    "detail": {
+        "oc": {
+            "license_allotment_xid": "10c4317f-7c4c-11ed-a524-0e4252a7e5f1",
+            "origin_ref": "3f7f5a50-a26b-425b-8d5e-157f63e72b1c",
+            "service_instance_xid": "b43d6e46-d6d0-4943-8b8d-c66a5f6e0d38"
+        },
+        "operation_id": "e72a8ca7-34cc-4e11-b80c-273592085a24"
+    },
+    "id": "0cc9e092-3b92-4652-8d9e-7622ef85dc79",
+    "metadata": {},
+    "ts": "2022-12-15T10:25:36.827661Z"
+}
+
+{
+    "activity": 400,
+    "context": {
+        "SERVICE_INSTANCE_ID": "b43d6e46-d6d0-4943-8b8d-c66a5f6e0d38",
+        "SERVICE_INSTANCE_NAME": "DEFAULT_2022-12-14_12:48:30",
+        "description": "lease_multi_create failed: no pool features found for: NVIDIA RTX Virtual Workstation",
+        "event_by": "system",
+        "function_name": "lease_multi_create",
+        "level": "warning",
+        "lineno": 157,
+        "module_name": "nls_services_lease.controllers.lease_multi_controller",
+        "operation_id": "e72a8ca7-34cc-4e11-b80c-273592085a24",
+        "service_name": "nls_services_lease"
+    },
+    "detail": {
+        "_msg": "lease_multi_create failed: no pool features found for: NVIDIA RTX Virtual Workstation",
+        "exec_info": ["NotFoundError", "NotFoundError(no pool features found for: NVIDIA RTX Virtual Workstation)", "  File \"/venv/lib/python3.9/site-packages/nls_services_lease/controllers/lease_multi_controller.py\", line 127, in lease_multi_create\n    data = _leaseMulti.lease_multi_create(event_args)\n  File \"/venv/lib/python3.9/site-packages/nls_core_lease/lease_multi.py\", line 208, in lease_multi_create\n    raise e\n  File \"/venv/lib/python3.9/site-packages/nls_core_lease/lease_multi.py\", line 184, in lease_multi_create\n    self._try_proposals(oc, mlr, results, detail)\n  File \"/venv/lib/python3.9/site-packages/nls_core_lease/lease_multi.py\", line 219, in _try_proposals\n    lease = self._leases.create(creator)\n  File \"/venv/lib/python3.9/site-packages/nls_dal_lease_dls/leases.py\", line 230, in create\n    features = self._get_features(creator)\n  File \"/venv/lib/python3.9/site-packages/nls_dal_lease_dls/leases.py\", line 148, in _get_features\n    self._explain_not_available(cur, creator)\n  File \"/venv/lib/python3.9/site-packages/nls_dal_lease_dls/leases.py\", line 299, in _explain_not_available\n    raise NotFoundError(f'no pool features found for: {lcc.product_name}')\n"],
+        "operation_id": "e72a8ca7-34cc-4e11-b80c-273592085a24"
+    },
+    "id": "282801b9-d612-40a5-9145-b56d8e420dac",
+    "metadata": {},
+    "ts": "2022-12-15T10:25:36.831673Z"
+}
+
+```
+
+**Stack Trace**
+
+```
+"NotFoundError", "NotFoundError(no pool features found for: NVIDIA RTX Virtual Workstation)", "  File \"/venv/lib/python3.9/site-packages/nls_services_lease/controllers/lease_multi_controller.py\", line 127, in lease_multi_create
+    data = _leaseMulti.lease_multi_create(event_args)
+  File \"/venv/lib/python3.9/site-packages/nls_core_lease/lease_multi.py\", line 208, in lease_multi_create
+    raise e
+  File \"/venv/lib/python3.9/site-packages/nls_core_lease/lease_multi.py\", line 184, in lease_multi_create
+    self._try_proposals(oc, mlr, results, detail)
+  File \"/venv/lib/python3.9/site-packages/nls_core_lease/lease_multi.py\", line 219, in _try_proposals
+    lease = self._leases.create(creator)
+  File \"/venv/lib/python3.9/site-packages/nls_dal_lease_dls/leases.py\", line 230, in create
+    features = self._get_features(creator)
+  File \"/venv/lib/python3.9/site-packages/nls_dal_lease_dls/leases.py\", line 148, in _get_features
+    self._explain_not_available(cur, creator)
+  File \"/venv/lib/python3.9/site-packages/nls_dal_lease_dls/leases.py\", line 299, in _explain_not_available
+    raise NotFoundError(f'no pool features found for: {lcc.product_name}')
+"
+```
+
+# Nginx
+
+- NGINX uses `/opt/certs/cert.pem` and `/opt/certs/key.pem`  
--- a/examples/docker-compose-http-and-https.yml
+++ b/examples/docker-compose-http-and-https.yml
@ -15,7 +15,7 @@ services:
      <<: *dls-variables
    volumes:
      - /etc/timezone:/etc/timezone:ro
-      - /opt/docker/fastapi-dls/cert:/app/cert
+      - /opt/docker/fastapi-dls/cert:/app/cert  # instance.private.pem, instance.public.pem
      - db:/app/database
    entrypoint: ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--app-dir", "/app", "--proxy-headers"]
    healthcheck:
--- a/requirements.txt
+++ b/requirements.txt
@ -1,8 +1,8 @@
-fastapi==0.115.12
-uvicorn[standard]==0.34.1
-python-jose[cryptography]==3.4.0
-cryptography==44.0.2
-python-dateutil==2.9.0
-sqlalchemy==2.0.40
-markdown==3.8
-python-dotenv==1.1.0
+fastapi==0.115.3
+uvicorn[standard]==0.32.0
+python-jose==3.3.0
+pycryptodome==3.21.0
+python-dateutil==2.8.2
+sqlalchemy==2.0.36
+markdown==3.7
+python-dotenv==1.0.1
--- a/test/create_driver_matrix_json.py
+++ b/test/create_driver_matrix_json.py
@ -6,7 +6,7 @@ logger.setLevel(logging.INFO)

 URL = 'https://docs.nvidia.com/vgpu/index.html'

-BRANCH_STATUS_KEY = 'vGPU Branch Status'
+BRANCH_STATUS_KEY, SOFTWARE_BRANCH_KEY, = 'vGPU Branch Status', 'vGPU Software Branch'
 VGPU_KEY, GRID_KEY, DRIVER_BRANCH_KEY = 'vGPU Software', 'vGPU Software', 'Driver Branch'
 LINUX_VGPU_MANAGER_KEY, LINUX_DRIVER_KEY = 'Linux vGPU Manager', 'Linux Driver'
 WINDOWS_VGPU_MANAGER_KEY, WINDOWS_DRIVER_KEY = 'Windows vGPU Manager', 'Windows Driver'
@ -26,15 +26,12 @@ def __driver_versions(html: 'BeautifulSoup'):

    # find wrapper for "DriverVersions" and find tables
    data = html.find('div', {'id': 'driver-versions'})
-    items = data.find_all('bsp-accordion', {'class': 'Accordion-items-item'})
+    items = data.findAll('bsp-accordion', {'class': 'Accordion-items-item'})
    for item in items:
        software_branch = item.find('div', {'class': 'Accordion-items-item-title'}).text.strip()
        software_branch = software_branch.replace(' Releases', '')
        matrix_key = software_branch.lower()

-        branch_status = item.find('a', href=True, string='Branch status')
-        branch_status = branch_status.next_sibling.replace(':', '').strip()
-
        # driver version info from table-heads (ths) and table-rows (trs)
        table = item.find('table')
        ths, trs = table.find_all('th'), table.find_all('tr')
@ -45,20 +42,48 @@ def __driver_versions(html: 'BeautifulSoup'):
                continue
            # create dict with table-heads as key and cell content as value
            x = {headers[i]: __strip(cell.text) for i, cell in enumerate(tds)}
-            x.setdefault(BRANCH_STATUS_KEY, branch_status)
            releases.append(x)

        # add to matrix
        MATRIX.update({matrix_key: {JSON_RELEASES_KEY: releases}})


+def __release_branches(html: 'BeautifulSoup'):
+    # find wrapper for "AllReleaseBranches" and find table
+    data = html.find('div', {'id': 'all-release-branches'})
+    table = data.find('table')
+
+    # branch releases info from table-heads (ths) and table-rows (trs)
+    ths, trs = table.find_all('th'), table.find_all('tr')
+    headers = [header.text.strip() for header in ths]
+    for trs in trs:
+        tds = trs.find_all('td')
+        if len(tds) == 0:  # skip empty
+            continue
+        # create dict with table-heads as key and cell content as value
+        x = {headers[i]: cell.text.strip() for i, cell in enumerate(tds)}
+
+        # get matrix_key
+        software_branch = x.get(SOFTWARE_BRANCH_KEY)
+        matrix_key = software_branch.lower()
+
+        # add to matrix
+        MATRIX.update({matrix_key: MATRIX.get(matrix_key) | x})
+
+
 def __debug():
    # print table head
-    s = f'{VGPU_KEY:^13} | {LINUX_VGPU_MANAGER_KEY:^21} | {LINUX_DRIVER_KEY:^21} | {WINDOWS_VGPU_MANAGER_KEY:^21} | {WINDOWS_DRIVER_KEY:^21} | {RELEASE_DATE_KEY:>21} | {BRANCH_STATUS_KEY:^21}'
+    s = f'{SOFTWARE_BRANCH_KEY:^21} | {BRANCH_STATUS_KEY:^21} | {VGPU_KEY:^13} | {LINUX_VGPU_MANAGER_KEY:^21} | {LINUX_DRIVER_KEY:^21} | {WINDOWS_VGPU_MANAGER_KEY:^21} | {WINDOWS_DRIVER_KEY:^21} | {RELEASE_DATE_KEY:>21} | {EOL_KEY:>21}'
    print(s)

    # iterate over dict & format some variables to not overload table
    for idx, (key, branch) in enumerate(MATRIX.items()):
+        branch_status = branch.get(BRANCH_STATUS_KEY)
+        branch_status = branch_status.replace('Branch ', '')
+        branch_status = branch_status.replace('Long-Term Support', 'LTS')
+        branch_status = branch_status.replace('Production', 'Prod.')
+
+        software_branch = branch.get(SOFTWARE_BRANCH_KEY).replace('NVIDIA ', '')
        for release in branch.get(JSON_RELEASES_KEY):
            version = release.get(VGPU_KEY, release.get(GRID_KEY, ''))
            linux_manager = release.get(LINUX_VGPU_MANAGER_KEY, release.get(ALT_VGPU_MANAGER_KEY, ''))
@ -67,25 +92,13 @@ def __debug():
            windows_driver = release.get(WINDOWS_DRIVER_KEY)
            release_date = release.get(RELEASE_DATE_KEY)
            is_latest = release.get(VGPU_KEY) == branch.get(LATEST_KEY)
-            branch_status = __parse_branch_status(release.get(BRANCH_STATUS_KEY, ''))

            version = f'{version} *' if is_latest else version
-            s = f'{version:<13} | {linux_manager:<21} | {linux_driver:<21} | {windows_manager:<21} | {windows_driver:<21} | {release_date:>21} | {branch_status:^21}'
+            eol = branch.get(EOL_KEY) if is_latest else ''
+            s = f'{software_branch:^21} | {branch_status:^21} | {version:<13} | {linux_manager:<21} | {linux_driver:<21} | {windows_manager:<21} | {windows_driver:<21} | {release_date:>21} | {eol:>21}'
            print(s)


-def __parse_branch_status(string: str) -> str:
-    string = string.replace('Production Branch', 'Prod. -')
-    string = string.replace('Long-Term Support Branch', 'LTS -')
-
-    string = string.replace('supported until', '')
-
-    string = string.replace('EOL since', 'EOL - ')
-    string = string.replace('EOL from', 'EOL -')
-
-    return string
-
-
 def __dump(filename: str):
    import json

@ -115,6 +128,7 @@ if __name__ == '__main__':

    # build matrix
    __driver_versions(soup)
+    __release_branches(soup)

    # debug output
    __debug()
--- a/test/main.py
+++ b/test/main.py
@ -1,45 +1,35 @@
-import json
-import sys
 from base64 import b64encode as b64enc
-from calendar import timegm
-from datetime import datetime, UTC
 from hashlib import sha256
+from calendar import timegm
+from datetime import datetime
+from os.path import dirname, join
 from uuid import uuid4, UUID

-from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
-from cryptography.hazmat.primitives.hashes import SHA256
 from dateutil.relativedelta import relativedelta
-from jose import jwt, jwk, jws
+from jose import jwt, jwk
 from jose.constants import ALGORITHMS
 from starlette.testclient import TestClient
+import sys

 # add relative path to use packages as they were in the app/ dir
 sys.path.append('../')
 sys.path.append('../app')

 from app import main
-from util import CASetup, PrivateKey, PublicKey, Cert
+from app.util import load_key

 client = TestClient(main.app)

-# Instance
-INSTANCE_REF = '10000000-0000-0000-0000-000000000001'
 ORIGIN_REF, ALLOTMENT_REF, SECRET = str(uuid4()), '20000000-0000-0000-0000-000000000001', 'HelloWorld'

-# CA & Signing
-ca_setup = CASetup(service_instance_ref=INSTANCE_REF)
-my_root_private_key = PrivateKey.from_file(ca_setup.root_private_key_filename)
-my_root_certificate = Cert.from_file(ca_setup.root_certificate_filename)
-my_ca_certificate = Cert.from_file(ca_setup.ca_certificate_filename)
-my_ca_private_key = PrivateKey.from_file(ca_setup.ca_private_key_filename)
-my_si_private_key = PrivateKey.from_file(ca_setup.si_private_key_filename)
-my_si_private_key_as_pem = my_si_private_key.pem()
-my_si_public_key = my_si_private_key.public_key()
-my_si_public_key_as_pem = my_si_private_key.public_key().pem()
-my_si_certificate = Cert.from_file(ca_setup.si_certificate_filename)
+# INSTANCE_KEY_RSA = generate_key()
+# INSTANCE_KEY_PUB = INSTANCE_KEY_RSA.public_key()

-jwt_encode_key = jwk.construct(my_si_private_key_as_pem, algorithm=ALGORITHMS.RS256)
-jwt_decode_key = jwk.construct(my_si_public_key_as_pem, algorithm=ALGORITHMS.RS256)
+INSTANCE_KEY_RSA = load_key(str(join(dirname(__file__), '../app/cert/instance.private.pem')))
+INSTANCE_KEY_PUB = load_key(str(join(dirname(__file__), '../app/cert/instance.public.pem')))
+
+jwt_encode_key = jwk.construct(INSTANCE_KEY_RSA.export_key().decode('utf-8'), algorithm=ALGORITHMS.RS256)
+jwt_decode_key = jwk.construct(INSTANCE_KEY_PUB.export_key().decode('utf-8'), algorithm=ALGORITHMS.RS256)


 def __bearer_token(origin_ref: str) -> str:
@ -48,48 +38,6 @@ def __bearer_token(origin_ref: str) -> str:
    return token


-def test_signing():
-    signature_set_header = my_si_private_key.generate_signature(b'Hello')
-
-    # test plain
-    my_si_public_key.verify_signature(signature_set_header, b'Hello')
-
-    # test "X-NLS-Signature: b'....'
-    x_nls_signature_header_value = f'{signature_set_header.hex().encode()}'
-    assert f'{x_nls_signature_header_value}'.startswith('b\'')
-    assert f'{x_nls_signature_header_value}'.endswith('\'')
-
-    # test eval
-    signature_get_header = eval(x_nls_signature_header_value)
-    signature_get_header = bytes.fromhex(signature_get_header.decode('ascii'))
-    my_si_public_key.verify_signature(signature_get_header, b'Hello')
-
-
-def test_keypair_and_certificates():
-    assert my_root_certificate.public_key().mod() == my_root_private_key.public_key().mod()
-    assert my_ca_certificate.public_key().mod() == my_ca_private_key.public_key().mod()
-    assert my_si_certificate.public_key().mod() == my_si_public_key.mod()
-
-    assert len(my_root_certificate.public_key().mod()) == 1024
-    assert len(my_ca_certificate.public_key().mod()) == 1024
-    assert len(my_si_certificate.public_key().mod()) == 512
-
-    #assert my_si_certificate.public_key().mod() != my_si_public_key.mod()
-
-    my_root_certificate.public_key().raw().verify(
-        my_ca_certificate.raw().signature,
-        my_ca_certificate.raw().tbs_certificate_bytes,
-        PKCS1v15(),
-        SHA256(),
-    )
-    my_ca_certificate.public_key().raw().verify(
-        my_si_certificate.raw().signature,
-        my_si_certificate.raw().tbs_certificate_bytes,
-        PKCS1v15(),
-        SHA256(),
-    )
-
-
 def test_index():
    response = client.get('/')
    assert response.status_code == 200
@ -106,12 +54,6 @@ def test_config():
    assert response.status_code == 200


-def test_config_root_ca():
-    response = client.get('/-/config/root-certificate')
-    assert response.status_code == 200
-    assert response.content.decode('utf-8').strip() == my_root_certificate.pem().decode('utf-8').strip()
-
-
 def test_readme():
    response = client.get('/-/readme')
    assert response.status_code == 200
@ -127,41 +69,6 @@ def test_client_token():
    assert response.status_code == 200


-def test_config_token():
-    # https://git.collinwebdesigns.de/nvidia/nls/-/blob/main/src/test/test_config_token.py
-
-    response = client.post('/leasing/v1/config-token', json={"service_instance_ref": INSTANCE_REF})
-    assert response.status_code == 200
-
-    nv_response_certificate_configuration = response.json().get('certificateConfiguration')
-
-    nv_ca_chain = nv_response_certificate_configuration.get('caChain')[0].encode('utf-8')
-    nv_ca_chain = Cert(nv_ca_chain)
-
-    nv_response_public_cert = nv_response_certificate_configuration.get('publicCert').encode('utf-8')
-    nv_response_public_key = nv_response_certificate_configuration.get('publicKey')
-
-    nv_si_certificate = Cert(nv_response_public_cert)
-    assert nv_si_certificate.public_key().mod() == nv_response_public_key.get('mod')[0]
-    assert nv_si_certificate.authority_key_identifier() == nv_ca_chain.subject_key_identifier()
-
-    nv_jwt_decode_key = jwk.construct(nv_response_public_cert, algorithm=ALGORITHMS.RS256)
-
-    nv_response_config_token = response.json().get('configToken')
-
-    payload = jws.verify(nv_response_config_token, key=nv_jwt_decode_key, algorithms=ALGORITHMS.RS256)
-    payload = json.loads(payload)
-    assert payload.get('iss') == 'NLS Service Instance'
-    assert payload.get('aud') == 'NLS Licensed Client'
-    assert payload.get('service_instance_ref') == INSTANCE_REF
-
-    nv_si_public_key_configuration = payload.get('service_instance_public_key_configuration')
-    nv_si_public_key_me = nv_si_public_key_configuration.get('service_instance_public_key_me')
-
-    assert len(nv_si_public_key_me.get('mod')) == 512 # nv_si_public_key_mod
-    assert nv_si_public_key_me.get('exp') == 65537  # nv_si_public_key_exp
-
-
 def test_origins():
    pass

@ -199,7 +106,6 @@ def test_auth_v1_origin():
    assert response.json().get('origin_ref') == ORIGIN_REF


-
 def auth_v1_origin_update():
    payload = {
        "registration_pending": False,
@ -235,7 +141,7 @@ def test_auth_v1_code():


 def test_auth_v1_token():
-    cur_time = datetime.now(UTC)
+    cur_time = datetime.utcnow()
    access_expires_on = cur_time + relativedelta(hours=1)

    payload = {
@ -247,7 +153,8 @@ def test_auth_v1_token():
        "kid": "00000000-0000-0000-0000-000000000000"
    }
    payload = {
-        "auth_code": jwt.encode(payload, key=jwt_encode_key, headers={'kid': payload.get('kid')}, algorithm=ALGORITHMS.RS256),
+        "auth_code": jwt.encode(payload, key=jwt_encode_key, headers={'kid': payload.get('kid')},
+                                algorithm=ALGORITHMS.RS256),
        "code_verifier": SECRET,
    }

@ -261,13 +168,12 @@ def test_auth_v1_token():

 def test_leasing_v1_lessor():
    payload = {
-        'client_challenge': 'my_unique_string',
        'fulfillment_context': {
            'fulfillment_class_ref_list': []
        },
        'lease_proposal_list': [{
            'license_type_qualifiers': {'count': 1},
-            'product': {'name': 'NVIDIA Virtual Applications'}
+            'product': {'name': 'NVIDIA RTX Virtual Workstation'}
        }],
        'proposal_evaluation_mode': 'ALL_OF',
        'scope_ref_list': [ALLOTMENT_REF]
@ -276,21 +182,12 @@ def test_leasing_v1_lessor():
    response = client.post('/leasing/v1/lessor', json=payload, headers={'authorization': __bearer_token(ORIGIN_REF)})
    assert response.status_code == 200

-    client_challenge = response.json().get('client_challenge')
-    assert client_challenge == payload.get('client_challenge')
-    signature = eval(response.headers.get('X-NLS-Signature'))
-    assert len(signature) == 512
-    signature = bytes.fromhex(signature.decode('ascii'))
-    assert len(signature) == 256
-    my_si_public_key.verify_signature(signature, response.content)
-
    lease_result_list = response.json().get('lease_result_list')
    assert len(lease_result_list) == 1
    assert len(lease_result_list[0]['lease']['ref']) == 36
    assert str(UUID(lease_result_list[0]['lease']['ref'])) == lease_result_list[0]['lease']['ref']
-    assert lease_result_list[0]['lease']['product_name'] == 'NVIDIA Virtual Applications'
-    assert lease_result_list[0]['lease']['feature_name'] == 'GRID-Virtual-Apps'

+    return lease_result_list[0]['lease']['ref']


 def test_leasing_v1_lessor_lease():
@ -310,18 +207,9 @@ def test_leasing_v1_lease_renew():

    ###

-    payload = {'client_challenge': 'my_unique_string'}
-    response = client.put(f'/leasing/v1/lease/{active_lease_ref}', json=payload, headers={'authorization': __bearer_token(ORIGIN_REF)})
+    response = client.put(f'/leasing/v1/lease/{active_lease_ref}', headers={'authorization': __bearer_token(ORIGIN_REF)})
    assert response.status_code == 200

-    client_challenge = response.json().get('client_challenge')
-    assert client_challenge == payload.get('client_challenge')
-    signature = eval(response.headers.get('X-NLS-Signature'))
-    assert len(signature) == 512
-    signature = bytes.fromhex(signature.decode('ascii'))
-    assert len(signature) == 256
-    my_si_public_key.verify_signature(signature, response.content)
-
    lease_ref = response.json().get('lease_ref')
    assert len(lease_ref) == 36
    assert lease_ref == active_lease_ref
@ -343,23 +231,7 @@ def test_leasing_v1_lease_delete():


 def test_leasing_v1_lessor_lease_remove():
-    # see "test_leasing_v1_lessor()"
-    payload = {
-        'fulfillment_context': {
-            'fulfillment_class_ref_list': []
-        },
-        'lease_proposal_list': [{
-            'license_type_qualifiers': {'count': 1},
-            'product': {'name': 'NVIDIA Virtual Applications'}
-        }],
-        'proposal_evaluation_mode': 'ALL_OF',
-        'scope_ref_list': [ALLOTMENT_REF]
-    }
-
-    response = client.post('/leasing/v1/lessor', json=payload, headers={'authorization': __bearer_token(ORIGIN_REF)})
-    lease_result_list = response.json().get('lease_result_list')
-    lease_ref = lease_result_list[0]['lease']['ref']
-    #
+    lease_ref = test_leasing_v1_lessor()

    response = client.delete('/leasing/v1/lessor/leases', headers={'authorization': __bearer_token(ORIGIN_REF)})
    assert response.status_code == 200