diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 737f400cf..b5926275c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ name: Build
 on:
   workflow_call:
     inputs:
-      docker_image:
+      container_image:
         required: true
         type: string
       ref:
@@ -23,11 +23,11 @@ permissions:
   packages: write
 
 jobs:
-  build-source:
+  source:
     name: "Build Source [${{ matrix.distro }}]"
     runs-on: ubuntu-latest
     container:
-      image: ${{ inputs.docker_image }}/dev-${{ matrix.image_name }}:${{ inputs.ref }}
+      image: ${{ inputs.container_image }}-dev-${{ matrix.image_name }}:${{ inputs.ref }}
       options: --user root
     strategy:
       fail-fast: false
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index caa535f62..2d9b52b3d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -28,15 +28,15 @@ jobs:
     runs-on: ubuntu-latest
     environment: ${{ github.event_name == 'pull_request_target' && 'fork-pr' || 'internal' }}
     outputs:
-      docker_image: ${{ steps.image.outputs.docker_image }}
+      container_image: ${{ steps.image.outputs.container_image }}
       ref: ${{ steps.ref.outputs.ref }}
       ref_name: ${{ steps.ref.outputs.ref_name }}
     steps:
       - name: Compute image name for the current repository
         id: image
         env:
-          OWNER: ${{ github.repository_owner }}
-        run: echo "docker_image=ghcr.io/${OWNER,,}/villas/node" >> "$GITHUB_OUTPUT"
+          REPOSITORY: ${{ github.repository }}
+        run: echo "container_image=ghcr.io/${REPOSITORY,,}" >> "$GITHUB_OUTPUT"
 
       # Under pull_request_target GITHUB_SHA and GITHUB_REF_NAME point at the base branch.
       - name: Resolve the revision under test
@@ -73,12 +73,12 @@ jobs:
       ref: ${{ needs.setup.outputs.ref }}
 
   prepare:
-    name: Prepare Docker Images
+    name: Prepare Container Images
     needs: [setup]
     secrets: inherit
     uses: ./.github/workflows/prepare.yaml
     with:
-      docker_image: ${{ needs.setup.outputs.docker_image }}
+      container_image: ${{ needs.setup.outputs.container_image }}
       ref: ${{ needs.setup.outputs.ref }}
       ref_name: ${{ needs.setup.outputs.ref_name }}
 
@@ -88,7 +88,7 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/build.yaml
     with:
-      docker_image: ${{ needs.setup.outputs.docker_image }}
+      container_image: ${{ needs.setup.outputs.container_image }}
       ref: ${{ needs.setup.outputs.ref }}
 
   test:
@@ -97,16 +97,16 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/test.yaml
     with:
-      docker_image: ${{ needs.setup.outputs.docker_image }}
+      container_image: ${{ needs.setup.outputs.container_image }}
       ref: ${{ needs.setup.outputs.ref }}
 
-  packaging-docker:
-    name: Build Docker Images
+  packaging-container:
+    name: Build Container Images
     needs: [setup, test, prepare]
     secrets: inherit
-    uses: ./.github/workflows/packaging-docker.yaml
+    uses: ./.github/workflows/packaging-container.yaml
     with:
-      docker_image: ${{ needs.setup.outputs.docker_image }}
+      container_image: ${{ needs.setup.outputs.container_image }}
       ref: ${{ needs.setup.outputs.ref }}
       ref_name: ${{ needs.setup.outputs.ref_name }}
 
@@ -116,17 +116,17 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/packaging-nix.yaml
     with:
-      docker_image: ${{ needs.setup.outputs.docker_image }}
+      container_image: ${{ needs.setup.outputs.container_image }}
       ref: ${{ needs.setup.outputs.ref }}
       ref_name: ${{ needs.setup.outputs.ref_name }}
 
   deploy:
-    name: Deploy Docker Images
-    needs: [setup, packaging-docker]
+    name: Deploy Container Images
+    needs: [setup, packaging-container]
     secrets: inherit
     uses: ./.github/workflows/deploy.yaml
     with:
-      docker_image: ${{ needs.setup.outputs.docker_image }}
+      container_image: ${{ needs.setup.outputs.container_image }}
       ref: ${{ needs.setup.outputs.ref }}
       ref_name: ${{ needs.setup.outputs.ref_name }}
       is_version_tag: ${{ startsWith(github.ref, 'refs/tags/v') }}
@@ -137,7 +137,7 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/deploy-nix.yaml
     with:
-      docker_image: ${{ needs.setup.outputs.docker_image }}
+      container_image: ${{ needs.setup.outputs.container_image }}
       ref_name: ${{ needs.setup.outputs.ref_name }}
       is_version_tag: ${{ startsWith(github.ref, 'refs/tags/v') }}
 
@@ -160,7 +160,7 @@ jobs:
       - prepare
       - build
       - test
-      - packaging-docker
+      - packaging-container
       - packaging-nix
       - deploy
       - deploy-nix
diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml
index 26370e767..8fdbd40e8 100644
--- a/.github/workflows/cleanup.yaml
+++ b/.github/workflows/cleanup.yaml
@@ -12,7 +12,7 @@ permissions:
   packages: write
 
 jobs:
-  cleanup-packages:
+  packages:
     name: Packages
     runs-on: ubuntu-latest
     steps:
@@ -22,9 +22,9 @@ jobs:
       - name: Cleanup GHCR Packages
         uses: dataaxiom/ghcr-cleanup-action@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ github.token }}
           owner: ${{ github.repository_owner }}
-          packages: ^villas/node(/.*)?$
+          packages: ^villasframework/node(/.*)?$
           expand-packages: true
           use-regex: true
           exclude-tags: ^(latest|master.*|v.*)$
diff --git a/.github/workflows/deploy-nix.yaml b/.github/workflows/deploy-nix.yaml
index fc875df0b..fb7ef450a 100644
--- a/.github/workflows/deploy-nix.yaml
+++ b/.github/workflows/deploy-nix.yaml
@@ -6,9 +6,6 @@ name: Deploy (Nix)
 on:
   workflow_call:
     inputs:
-      docker_image:
-        required: true
-        type: string
       ref_name:
         required: true
         type: string
@@ -18,16 +15,15 @@ on:
         default: false
 
 env:
-  REGISTRY: ghcr.io
-  DOCKER_IMAGE: ${{ inputs.docker_image }}
+  CONTAINER_IMAGE: ghcr.io/villasframework/node
 
 permissions:
   contents: read
   packages: write
 
 jobs:
-  deploy-docker-nix:
-    name: Nix-based Docker Images
+  container-nix:
+    name: Nix-based Container Images
     runs-on: ubuntu-latest
     steps:
       - name: Build Image
@@ -36,9 +32,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Compute safe ref Tag
         id: ref
@@ -49,14 +45,14 @@ jobs:
       - name: Create and Push Multi-arch Nix Manifest
         run: |
           docker buildx imagetools create \
-            -t "${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-nix" \
-            "${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-nix-x86_64-linux" \
-            "${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-nix-aarch64-linux"
+            -t "${{ env.CONTAINER_IMAGE }}:${{ steps.ref.outputs.tag }}-nix" \
+            "${{ env.CONTAINER_IMAGE }}:${{ steps.ref.outputs.tag }}-nix-x86_64-linux" \
+            "${{ env.CONTAINER_IMAGE }}:${{ steps.ref.outputs.tag }}-nix-aarch64-linux"
 
-  latest-docker-nix:
-    name: Tag Nix-based Docker Images as latest-nix
+  latest-container-nix:
+    name: Tag Nix-based Container Images as latest-nix
     if: ${{ inputs.is_version_tag }}
-    needs: [deploy-docker-nix]
+    needs: [container-nix]
     runs-on: ubuntu-latest
     steps:
       - name: Build Image
@@ -65,9 +61,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Compute safe ref Tag
         id: ref
@@ -78,8 +74,8 @@ jobs:
       - name: Tag Nix Manifest as latest-nix
         run: |
           docker buildx imagetools create \
-            -t "${{ env.DOCKER_IMAGE }}:latest-nix" \
-            "${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-nix"
+            -t "${{ env.CONTAINER_IMAGE }}:latest-nix" \
+            "${{ env.CONTAINER_IMAGE }}:${{ steps.ref.outputs.tag }}-nix"
 
   release-nix:
     name: Release Nix
@@ -98,7 +94,7 @@ jobs:
 
       - name: Publish ARX and RPM Bundles to the Release
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ github.token }}
         run: |
           gh release create "${GITHUB_REF_NAME}" dist/* \
             --repo "${GITHUB_REPOSITORY}" \
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index aa5c22fa2..b98803b30 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -6,7 +6,7 @@ name: Deploy
 on:
   workflow_call:
     inputs:
-      docker_image:
+      container_image:
         required: true
         type: string
       ref:
@@ -20,17 +20,13 @@ on:
         type: boolean
         default: false
 
-env:
-  REGISTRY: ghcr.io
-  DOCKER_IMAGE: ${{ inputs.docker_image }}
-
 permissions:
   contents: read
   packages: write
 
 jobs:
-  deploy-docker:
-    name: Docker Images
+  container:
+    name: Container Images
     runs-on: ubuntu-latest
     steps:
       - name: Build Image
@@ -39,9 +35,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Compute safe ref Tag
         id: ref
@@ -52,12 +48,12 @@ jobs:
       - name: Create and push multi-arch manifest
         run: |
           docker buildx imagetools create \
-            -t "${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}" \
-            "${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-x86_64" \
-            "${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-arm64"
+            -t "${{ inputs.container_image }}:${{ steps.ref.outputs.tag }}" \
+            "${{ inputs.container_image }}:${{ steps.ref.outputs.tag }}-x86_64" \
+            "${{ inputs.container_image }}:${{ steps.ref.outputs.tag }}-arm64"
 
-  deploy-docker-dev:
-    name: Docker Dev Images
+  container-dev:
+    name: Container Dev Images
     runs-on: ubuntu-latest
     steps:
       - name: Build Image
@@ -66,9 +62,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Compute safe ref Tag
         id: ref
@@ -79,11 +75,11 @@ jobs:
       - name: Publish dev image for current ref
         run: |
           docker buildx imagetools create \
-            -t "${{ env.DOCKER_IMAGE }}/dev:${{ steps.ref.outputs.tag }}" \
-            "${{ env.DOCKER_IMAGE }}/dev-fedora:${{ steps.ref.outputs.tag }}"
+            -t "${{ inputs.container_image }}/dev:${{ steps.ref.outputs.tag }}" \
+            "${{ inputs.container_image }}/dev-fedora:${{ steps.ref.outputs.tag }}"
 
-  deploy-docker-dev-vscode:
-    name: Docker Dev VSCode Images
+  container-dev-vscode:
+    name: Container Dev VSCode Images
     runs-on: ubuntu-latest
     steps:
       - name: Build Image
@@ -92,9 +88,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Compute safe ref Tag
         id: ref
@@ -105,13 +101,13 @@ jobs:
       - name: Publish dev-vscode image for current ref
         run: |
           docker buildx imagetools create \
-            -t "${{ env.DOCKER_IMAGE }}/dev-vscode:${{ steps.ref.outputs.tag }}" \
-            "${{ env.DOCKER_IMAGE }}/dev-vscode:${{ inputs.ref }}"
+            -t "${{ inputs.container_image }}/dev-vscode:${{ steps.ref.outputs.tag }}" \
+            "${{ inputs.container_image }}/dev-vscode:${{ inputs.ref }}"
 
-  latest-docker:
-    name: Docker Images as latest
+  latest-container:
+    name: Container Images as latest
     if: ${{ inputs.is_version_tag }}
-    needs: [deploy-docker]
+    needs: [container]
     runs-on: ubuntu-latest
     steps:
       - name: Build Image
@@ -120,9 +116,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Compute safe ref Tag
         id: ref
@@ -133,14 +129,14 @@ jobs:
       - name: Tag and Push Image as latest
         run: |
           docker buildx imagetools create \
-            -t "${{ env.DOCKER_IMAGE }}:latest" \
-            "${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-x86_64" \
-            "${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-arm64"
+            -t "${{ inputs.container_image }}:latest" \
+            "${{ inputs.container_image }}:${{ steps.ref.outputs.tag }}-x86_64" \
+            "${{ inputs.container_image }}:${{ steps.ref.outputs.tag }}-arm64"
 
-  latest-docker-dev:
-    name: Docker Dev Images as latest
+  latest-container-dev:
+    name: Container Dev Images as latest
     if: ${{ inputs.is_version_tag }}
-    needs: [deploy-docker-dev]
+    needs: [container-dev]
     runs-on: ubuntu-latest
     steps:
       - name: Build Image
@@ -149,9 +145,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Compute safe ref Tag
         id: ref
@@ -162,5 +158,5 @@ jobs:
       - name: Tag and push dev image as latest
         run: |
           docker buildx imagetools create \
-            -t "${{ env.DOCKER_IMAGE }}/dev:latest" \
-            "${{ env.DOCKER_IMAGE }}/dev:${{ steps.ref.outputs.tag }}"
+            -t "${{ inputs.container_image }}/dev:latest" \
+            "${{ inputs.container_image }}/dev:${{ steps.ref.outputs.tag }}"
diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml
index f8abe231a..3c2d15fe2 100644
--- a/.github/workflows/nix.yaml
+++ b/.github/workflows/nix.yaml
@@ -14,7 +14,7 @@ permissions:
   contents: read
 
 jobs:
-  build-nix:
+  build:
     name: "Nix [${{ matrix.system }}]"
     runs-on: ubuntu-latest
     strategy:
diff --git a/.github/workflows/packaging-docker.yaml b/.github/workflows/packaging-docker.yaml
index 50a7d4bb1..49cda6a90 100644
--- a/.github/workflows/packaging-docker.yaml
+++ b/.github/workflows/packaging-docker.yaml
@@ -1,12 +1,12 @@
 # SPDX-FileCopyrightText: 2026 Institute for Automation of Complex Power Systems, RWTH Aachen University
 # SPDX-License-Identifier: Apache-2.0
 
-name: Packaging (Docker)
+name: Packaging (Containers)
 
 on:
   workflow_call:
     inputs:
-      docker_image:
+      container_image:
         required: true
         type: string
       ref:
@@ -17,8 +17,6 @@ on:
         type: string
 
 env:
-  REGISTRY: ghcr.io
-  DOCKER_IMAGE: ${{ inputs.docker_image }}
   CMAKE_EXTRA_OPTS: -DCMAKE_BUILD_TYPE=Release
   DOCKER_FILE: packaging/docker/Dockerfile.debian
 
@@ -27,8 +25,8 @@ permissions:
   packages: write
 
 jobs:
-  pkg-docker-x86_64:
-    name: "Docker [x86_64]"
+  container-x86_64:
+    name: "Container [x86_64]"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -47,9 +45,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Compute safe ref Tag
         id: ref
@@ -74,10 +72,10 @@ jobs:
             ARCH=x86_64
             TRIPLET=x86_64-linux-gnu
             CMAKE_OPTS=${{ env.CMAKE_EXTRA_OPTS }}
-          tags: ${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-x86_64
+          tags: ${{ inputs.container_image }}:${{ steps.ref.outputs.tag }}-x86_64
 
-  pkg-docker-arm64:
-    name: "Docker [arm64]"
+  container-arm64:
+    name: "Container [arm64]"
     runs-on: ubuntu-24.04-arm
     steps:
       - name: Checkout
@@ -94,9 +92,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Compute safe ref Tag
         id: ref
@@ -108,7 +106,7 @@ jobs:
         uses: docker/build-push-action@v7
         with:
           context: .
-          file: packaging/docker/Dockerfile.debian
+          file: ${{ env.DOCKER_FILE }}
           target: app
           push: true
           pull: true
@@ -119,4 +117,4 @@ jobs:
             ARCH=arm64
             TRIPLET=aarch64-linux-gnu
             CMAKE_OPTS=${{ env.CMAKE_EXTRA_OPTS }}
-          tags: ${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-arm64
+          tags: ${{ inputs.container_image }}:${{ steps.ref.outputs.tag }}-arm64
diff --git a/.github/workflows/packaging-nix.yaml b/.github/workflows/packaging-nix.yaml
index abcf76c39..2048f9544 100644
--- a/.github/workflows/packaging-nix.yaml
+++ b/.github/workflows/packaging-nix.yaml
@@ -6,7 +6,7 @@ name: Packaging (Nix)
 on:
   workflow_call:
     inputs:
-      docker_image:
+      container_image:
         required: true
         type: string
       ref:
@@ -16,16 +16,12 @@ on:
         required: true
         type: string
 
-env:
-  REGISTRY: ghcr.io
-  DOCKER_IMAGE: ${{ inputs.docker_image }}
-
 permissions:
   contents: read
   packages: write
 
 jobs:
-  pkg-nix-arx:
+  arx:
     name: "ARX [${{ matrix.system }}]"
     runs-on: ubuntu-latest
     strategy:
@@ -66,7 +62,7 @@ jobs:
           path: artifacts/
           retention-days: 90
 
-  pkg-nix-rpm:
+  rpm:
     name: "RPM [${{ matrix.system }}]"
     runs-on: ubuntu-latest
     strategy:
@@ -107,8 +103,8 @@ jobs:
           path: artifacts/
           retention-days: 90
 
-  pkg-nix-docker:
-    name: "Docker [${{ matrix.system }}]"
+  container:
+    name: "Container [${{ matrix.system }}]"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -133,10 +129,10 @@ jobs:
           cache: villas
           token: ${{ secrets.ATTIC_TOKEN }}
 
-      - name: Bundle as Docker Image
+      - name: Bundle as Container Image
         run: |
           mkdir -p /var/tmp/
-          nix bundle --print-build-logs --out-link bundle-docker \
+          nix bundle --print-build-logs --out-link bundle-container \
             --bundler github:NixOS/bundlers#toDockerImage \
             ".#villas-node-${{ matrix.system }}"
 
@@ -153,10 +149,11 @@ jobs:
           echo 'unqualified-search-registries = []' > "$CONTAINERS_REGISTRIES_CONF"
           nix run nixpkgs#skopeo -- login \
             --username "${{ github.actor }}" \
-            --password "${{ secrets.GITHUB_TOKEN }}" \
-            "${{ env.REGISTRY }}"
+            --password "${{ github.token }}" \
+            ghcr.io
           nix run nixpkgs#skopeo -- \
             --tmpdir="${{ runner.temp }}" \
             --insecure-policy \
-            copy "docker-archive:./bundle-docker" \
-            "docker://${{ env.DOCKER_IMAGE }}:${{ steps.ref.outputs.tag }}-nix-${{ matrix.system }}"
+            --insecure-policy \
+            copy "docker-archive:./bundle-container" \
+            "docker://${{ inputs.container_image }}:${{ steps.ref.outputs.tag }}-nix-${{ matrix.system }}"
diff --git a/.github/workflows/prepare.yaml b/.github/workflows/prepare.yaml
index fba087952..7e991187f 100644
--- a/.github/workflows/prepare.yaml
+++ b/.github/workflows/prepare.yaml
@@ -6,7 +6,7 @@ name: Prepare
 on:
   workflow_call:
     inputs:
-      docker_image:
+      container_image:
         required: true
         type: string
       ref:
@@ -16,18 +16,13 @@ on:
         required: true
         type: string
 
-env:
-  REGISTRY: ghcr.io
-  DOCKER_IMAGE: ${{ inputs.docker_image }}
-  DOCKER_TAG: ${{ inputs.ref }}
-
 permissions:
   contents: read
   packages: write
 
 jobs:
-  prepare-docker:
-    name: "Prepare Docker Dev Images [${{ matrix.name }}]"
+  container:
+    name: "Prepare Container Dev Images [${{ matrix.name }}]"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -67,9 +62,9 @@ jobs:
       - name: Login to Registry
         uses: docker/login-action@v4
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
       - name: Build Image
         uses: docker/setup-buildx-action@v4
@@ -90,13 +85,13 @@ jobs:
           cache-from: type=gha,scope=dev-${{ matrix.image_name }}
           cache-to: ${{ github.event_name != 'pull_request_target' && format('type=gha,mode=max,scope=dev-{0}', matrix.image_name) || '' }}
           tags: |
-            ${{ env.DOCKER_IMAGE }}/dev-${{ matrix.image_name }}:${{ env.DOCKER_TAG }}
-            ${{ env.DOCKER_IMAGE }}/dev-${{ matrix.image_name }}:${{ steps.ref.outputs.tag }}
+            ${{ inputs.container_image }}/dev-${{ matrix.image_name }}:${{ inputs.ref }}
+            ${{ inputs.container_image }}/dev-${{ matrix.image_name }}:${{ steps.ref.outputs.tag }}
 
       - name: Publish fedora dev alias
         if: matrix.name == 'fedora'
         run: |
           docker buildx imagetools create \
-            -t "${{ env.DOCKER_IMAGE }}/dev:${{ env.DOCKER_TAG }}" \
-            -t "${{ env.DOCKER_IMAGE }}/dev:${{ steps.ref.outputs.tag }}" \
-            "${{ env.DOCKER_IMAGE }}/dev-fedora:${{ env.DOCKER_TAG }}"
+            -t "${{ inputs.container_image }}/dev:${{ inputs.ref }}" \
+            -t "${{ inputs.container_image }}/dev:${{ steps.ref.outputs.tag }}" \
+            "${{ inputs.container_image }}/dev-fedora:${{ inputs.ref }}"
diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
index f30786dbe..25cdbd5ae 100644
--- a/.github/workflows/release-please.yaml
+++ b/.github/workflows/release-please.yaml
@@ -21,13 +21,13 @@ jobs:
       - id: release
         uses: googleapis/release-please-action@v4
         with:
-          token: ${{ secrets.RELEASE_PLEASE_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ github.token }}
           target-branch: master
 
       # A tag pushed with GITHUB_TOKEN starts no workflow, but a dispatch always does.
       - name: Start the release pipeline
         if: steps.release.outputs.release_created == 'true'
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ github.token }}
           TAG: ${{ steps.release.outputs.tag_name }}
         run: gh workflow run ci.yaml --repo "${GITHUB_REPOSITORY}" --ref "${TAG}"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2243ad816..44a907141 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -25,11 +25,11 @@ permissions:
   actions: read
 
 jobs:
-  test-python:
+  python:
     name: Python
     runs-on: ubuntu-latest
     container:
-      image: ${{ inputs.docker_image }}/dev-fedora:${{ inputs.ref }}
+      image: ghcr.io/villasframework/node/dev-fedora:${{ inputs.ref }}
       options: --user root
     steps:
       - name: Checkout
@@ -60,11 +60,11 @@ jobs:
           cd python
           mypy --namespace-packages --explicit-package-bases .
 
-  test-cppcheck:
+  cppcheck:
     name: CPPCheck
     runs-on: ubuntu-latest
     container:
-      image: ${{ inputs.docker_image }}/dev-fedora:${{ inputs.ref }}
+      image: ghcr.io/villasframework/node/dev-fedora:${{ inputs.ref }}
       options: --user root
     steps:
       - name: Checkout
@@ -85,11 +85,11 @@ jobs:
           name: cppcheck-log
           path: cppcheck.log
 
-  test-unit:
+  unit:
     name: Unit Tests
     runs-on: ubuntu-latest
     container:
-      image: ${{ inputs.docker_image }}/dev-fedora:${{ inputs.ref }}
+      image: ghcr.io/villasframework/node/dev-fedora:${{ inputs.ref }}
       options: --user root
     steps:
       - name: Checkout
@@ -119,11 +119,11 @@ jobs:
       - name: Build and run unit tests
         run: LD_LIBRARY_PATH=/usr/local/lib64:$LD_LIBRARY_PATH cmake --build build ${{ env.CMAKE_BUILD_OPTS }} --target run-unit-tests run-unit-tests-common
 
-  test-integration:
+  integration:
     name: Integration Tests
     runs-on: ubuntu-latest
     container:
-      image: ${{ inputs.docker_image }}/dev-fedora:${{ inputs.ref }}
+      image: ghcr.io/villasframework/node/dev-fedora:${{ inputs.ref }}
       options: --user root
     services:
       rabbitmq:
diff --git a/packaging/docker/Dockerfile.debian b/packaging/docker/Dockerfile.debian
index 8a35b80a4..13db20b2d 100644
--- a/packaging/docker/Dockerfile.debian
+++ b/packaging/docker/Dockerfile.debian
@@ -93,4 +93,4 @@ LABEL \
 	org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Debian" \
 	org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
 	org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
-	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"
+	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#container"
diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch
index b34711ca5..cf072543c 100644
--- a/packaging/docker/Dockerfile.debian-multiarch
+++ b/packaging/docker/Dockerfile.debian-multiarch
@@ -175,4 +175,4 @@ LABEL \
 	org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Debian" \
 	org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
 	org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
-	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"
+	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#container"
diff --git a/packaging/docker/Dockerfile.fedora b/packaging/docker/Dockerfile.fedora
index c1e0ba250..df6e516f4 100644
--- a/packaging/docker/Dockerfile.fedora
+++ b/packaging/docker/Dockerfile.fedora
@@ -143,4 +143,4 @@ LABEL \
 	org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Fedora" \
 	org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
 	org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
-	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"
+	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#container"
diff --git a/packaging/docker/Dockerfile.fedora-minimal b/packaging/docker/Dockerfile.fedora-minimal
index c9d779371..49a910ed2 100644
--- a/packaging/docker/Dockerfile.fedora-minimal
+++ b/packaging/docker/Dockerfile.fedora-minimal
@@ -66,4 +66,4 @@ LABEL \
 	org.label-schema.description="A image containing minimal build-time dependencies for VILLASnode based on Fedora" \
 	org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
 	org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
-	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"
+	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#container"
diff --git a/packaging/docker/Dockerfile.rocky b/packaging/docker/Dockerfile.rocky
index 01a34338f..f10608734 100644
--- a/packaging/docker/Dockerfile.rocky
+++ b/packaging/docker/Dockerfile.rocky
@@ -102,4 +102,4 @@ LABEL \
 	org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Rocky Linux" \
 	org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
 	org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
-	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"
+	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#container"
diff --git a/packaging/docker/Dockerfile.rocky9 b/packaging/docker/Dockerfile.rocky9
index b0d762ebf..e6da88d86 100644
--- a/packaging/docker/Dockerfile.rocky9
+++ b/packaging/docker/Dockerfile.rocky9
@@ -97,4 +97,4 @@ LABEL \
 	org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Rocky Linux 9" \
 	org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
 	org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
-	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"
+	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#container"
diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu
index bc0b86181..22a5ea50e 100644
--- a/packaging/docker/Dockerfile.ubuntu
+++ b/packaging/docker/Dockerfile.ubuntu
@@ -105,4 +105,4 @@ LABEL \
 	org.label-schema.description="An image containing all build-time dependencies for VILLASnode based on Ubuntu" \
 	org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \
 	org.label-schema.vcs-url="https://github.com/VILLASframework/node" \
-	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#docker"
+	org.label-schema.usage="https://villas.fein-aachen.org/docs/node/installation#container"