diff --git a/.github/workflows/docker_bullseye_cache.yml b/.github/workflows/docker_bullseye_cache.yml
index e36109516..60fadce5b 100644
--- a/.github/workflows/docker_bullseye_cache.yml
+++ b/.github/workflows/docker_bullseye_cache.yml
@@ -12,7 +12,7 @@ on:
     branches: [ develop ]
 
 env:
-  DOCKER_IMAGE_NAME: rpi-jukebox-rfid-bullseye-altuser
+  DOCKER_IMAGE_NAME: rpi-jukebox-rfid-bullseye
   TEMP_DOCKER_PATH: /tmp/
   CACHE_KEY_SUFFIX: -${{ github.sha }}-${{ github.run_attempt }}
 
@@ -32,7 +32,7 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3.0.0
 
-    - name: Build Bullseye ARMv7 altuser
+    - name: Build Bullseye ARMv7
       uses: docker/build-push-action@v5
       with:
         context: .
@@ -40,13 +40,11 @@ jobs:
         push: false
         file: ./ci/Dockerfile.bullseye.test_install.armv7
         platforms: linux/arm/v7
-        tags: ${{ env.DOCKER_IMAGE_NAME }}:latest
+        tags: ${{ env.DOCKER_IMAGE_NAME }}:cache
         cache-from: type=gha,scope=${{ github.ref_name }}-cache
         cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-cache
         outputs: type=docker,dest=${{ env.TEMP_DOCKER_PATH }}${{ env.DOCKER_IMAGE_NAME }}.tar
         build-args: |
-          USER_NAME=hans
-          USER_GROUP=wurst
           GIT_BRANCH=${{ github.ref_name }}
           GIT_URL=${{ github.server_url }}/${{ github.repository }}
 
@@ -90,7 +88,7 @@ jobs:
     - name: Run ${{ matrix.test_Script }} Bullseye ARMv7
       uses: tj-actions/docker-run@v2
       with:
-        image: ${{ env.DOCKER_IMAGE_NAME }}:latest
+        image: ${{ env.DOCKER_IMAGE_NAME }}:cache
         options: --platform linux/arm/v7
         name: ${{ matrix.test_Script }}
         args: |
diff --git a/.github/workflows/docker_bullseye_upload_artefact.yml b/.github/workflows/docker_bullseye_upload_artefact.yml
index 215f4ada4..237986a64 100644
--- a/.github/workflows/docker_bullseye_upload_artefact.yml
+++ b/.github/workflows/docker_bullseye_upload_artefact.yml
@@ -12,7 +12,7 @@ on:
     branches: [ develop ]
 
 env:
-  DOCKER_IMAGE_NAME: rpi-jukebox-rfid-bullseye-altuser
+  DOCKER_IMAGE_NAME: rpi-jukebox-rfid-bullseye
   TEMP_DOCKER_PATH: /tmp/
 
 jobs:
@@ -31,7 +31,7 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3.0.0
 
-    - name: Build Bullseye ARMv7 altuser
+    - name: Build Bullseye ARMv7
       uses: docker/build-push-action@v5
       with:
         context: .
@@ -39,13 +39,11 @@ jobs:
         push: false
         file: ./ci/Dockerfile.bullseye.test_install.armv7
         platforms: linux/arm/v7
-        tags: ${{ env.DOCKER_IMAGE_NAME }}:latest
+        tags: ${{ env.DOCKER_IMAGE_NAME }}:cache
         cache-from: type=gha,scope=${{ github.ref_name }}-upload
         cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-upload
         outputs: type=docker,dest=${{ env.TEMP_DOCKER_PATH }}${{ env.DOCKER_IMAGE_NAME }}.tar
         build-args: |
-          USER_NAME=hans
-          USER_GROUP=wurst
           GIT_BRANCH=${{ github.ref_name }}
           GIT_URL=${{ github.server_url }}/${{ github.repository }}
 
@@ -87,7 +85,7 @@ jobs:
     - name: Run ${{ matrix.test_Script }} Bullseye ARMv7
       uses: tj-actions/docker-run@v2
       with:
-        image: ${{ env.DOCKER_IMAGE_NAME }}:latest
+        image: ${{ env.DOCKER_IMAGE_NAME }}:cache
         options: --platform linux/arm/v7
         name: ${{ matrix.test_Script }}
         args: |