diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
index 21194f1d8..b76310fc7 100644
--- a/.github/workflows/check-release.yml
+++ b/.github/workflows/check-release.yml
@@ -45,7 +45,7 @@ jobs:
   
   test-docker-images:
     runs-on: ubuntu-latest
-    name: Build all docker images and check if they do run
+    name: Build all docker images
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/prerelease-on-merge-to-main.yml b/.github/workflows/prerelease-on-merge-to-main.yml
index 47196b3d2..3a68951cf 100644
--- a/.github/workflows/prerelease-on-merge-to-main.yml
+++ b/.github/workflows/prerelease-on-merge-to-main.yml
@@ -271,6 +271,8 @@ jobs:
           load: true
           file: ./src/docker/Dockerfile-AasxServerBlazor
           tags: adminshellio/aasx-server-blazor-for-demo:main
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          labels: ${{ env.VERSION_NUMBER }}
           
       - name: Build and publish AasxServerBlazor-arm32
         uses: docker/build-push-action@v6
@@ -279,6 +281,8 @@ jobs:
           load: true
           file: ./src/docker/Dockerfile-AasxServerBlazor-arm32
           tags: adminshellio/aasx-server-blazor-for-demo-arm32:main
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          labels: ${{ env.VERSION_NUMBER }}
 
       - name: Build and publish AasxServerBlazor-arm64
         uses: docker/build-push-action@v6
@@ -288,6 +292,7 @@ jobs:
           file: ./src/docker/Dockerfile-AasxServerBlazor-arm64
           tags: adminshellio/aasx-server-blazor-for-demo-arm64:main
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          labels: ${{ env.VERSION_NUMBER }}
 
 
       - name: Build and publish AasxServerCore
@@ -298,6 +303,7 @@ jobs:
           file: ./src/docker/Dockerfile-AasxServerAspNetCore
           tags: adminshellio/aasx-server-aspnetcore-for-demo:main
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          labels: ${{ env.VERSION_NUMBER }}
 
       - name: Build and publish AasxServerCore-arm32
         uses: docker/build-push-action@v6
@@ -307,6 +313,7 @@ jobs:
           file: ./src/docker/Dockerfile-AasxServerAspNetCore-arm32
           tags: adminshellio/aasx-server-aspnetcore-for-demo-arm32:main
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          labels: ${{ env.VERSION_NUMBER }}
 
       - name: Build and publish AasxServerCore-arm64
         uses: docker/build-push-action@v6
@@ -316,3 +323,4 @@ jobs:
           file: ./src/docker/Dockerfile-AasxServerAspNetCore-arm64
           tags: adminshellio/aasx-server-aspnetcore-for-demo-arm64:main
           github-token: ${{ secrets.GITHUB_TOKEN }}"
+          labels: ${{ env.VERSION_NUMBER }}
diff --git a/.github/workflows/test-report.yml b/.github/workflows/test-report.yml
deleted file mode 100644
index bc6fef189..000000000
--- a/.github/workflows/test-report.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Test Report
-on:
-  workflow_run:
-    workflows: [ 'Test and verify branch' ]
-    types:
-      - completed
-permissions:
-  contents: read
-  actions: read
-  checks: write
-jobs:
-  report:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: test-results
-
-      - uses: dorny/test-reporter@v1
-        with:
-          artifact: test-results
-          name: Test Results
-          path: '*.trx'
-          reporter: jest-junit
\ No newline at end of file
diff --git a/src/AasxServer.sln b/src/AasxServer.sln
index 335432960..20a159643 100644
--- a/src/AasxServer.sln
+++ b/src/AasxServer.sln
@@ -64,7 +64,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 		..\.github\workflows\prerelease-on-merge-to-main.yml = ..\.github\workflows\prerelease-on-merge-to-main.yml
 		..\.github\workflows\code-analysis.yml = ..\.github\workflows\code-analysis.yml
 		..\.github\workflows\create-developer-prerelease.yml = ..\.github\workflows\create-developer-prerelease.yml
-		..\.github\workflows\test-report.yml = ..\.github\workflows\test-report.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectScripts", "ProjectScripts", "{39F9287F-CBC6-4F56-AA55-81A013A89AAE}"