diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1c9a2cc9..ec61ff9a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,11 +16,6 @@ on:
         description: 'Build/test LXD image?'
         required: false
         default: true
-      docker:
-        type: boolean
-        description: 'Build/test docker images?'
-        required: false
-        default: true
       installer:
         type: boolean
         description: 'Run curl-installer/upgrade tests?'
@@ -28,16 +23,14 @@ on:
         default: true
       release:
         type: boolean
-        description: 'Release images to GH and docker registry'
+        description: 'Release images to GH'
         required: false
         default: false
   push:
     tags:
       - "v*"
-      - "docker-v*"
     branches:
       - master
-      - docker-stable
 
 permissions:
   contents: write
@@ -58,30 +51,6 @@ jobs:
       arch: 'arm64'
     secrets: inherit
 
-  docker-x86:
-    if: ${{ inputs.docker || ( github.event_name != 'workflow_dispatch' && startsWith(github.ref_name, 'docker-') ) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
-      arch: "x86"
-    secrets: inherit
-
-  docker-armhf:
-    if: ${{ inputs.docker || ( github.event_name != 'workflow_dispatch' && startsWith(github.ref_name, 'docker-') ) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
-      arch: "armhf"
-    secrets: inherit
-
-  docker-arm64:
-    if: ${{ inputs.docker || ( github.event_name != 'workflow_dispatch' && startsWith(github.ref_name, 'docker-') ) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      git_ref: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
-      arch: "arm64"
-    secrets: inherit
-
   test-curl-installer:
     if: ${{ inputs.installer || ( github.event_name != 'workflow_dispatch' && !startsWith(github.ref_name, 'docker-') ) }}
     uses: ./.github/workflows/vm-tests.yml
@@ -326,55 +295,6 @@ jobs:
       dry_run: ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v'))  }}
     secrets: inherit
 
-  docker-release:
-    needs:
-      - docker-x86
-      - docker-armhf
-      - docker-arm64
-    if: ${{ (inputs.release || github.event_name != 'workflow_dispatch') && github.ref_type == 'tag' && (github.ref_protected || startsWith(github.ref, 'refs/tags/docker-v'))  }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Create manifest and push as tag to docker hub
-        run: |
-          . ./build/buildlib.sh
-          version="${version#docker-}"
-          
-          for arch in x86 armhf arm64
-          do
-            docker pull "thecalcaholic/ncp-internal-${arch}:${{ github.run_id }}"
-            docker tag "thecalcaholic/ncp-internal-${arch}:${{ github.run_id }}" "ownyourbits/nextcloudpi-${arch}:${version?}"
-            docker tag "ownyourbits/nextcloudpi-${arch}:${version?}" "ownyourbits/nextcloudpi-${arch}:latest"
-            docker push "ownyourbits/nextcloudpi-${arch}:${version?}"
-            [[ "$version" =~ ^(docker-)?v[0-9]+'.'[0-9]+'.'[0-9]+$ ]] && docker push "ownyourbits/nextcloudpi-${arch}:latest"
-          done
-
-          docker manifest create ownyourbits/nextcloudpi:${version?} \
-            ownyourbits/nextcloudpi-armhf:${version?} \
-            ownyourbits/nextcloudpi-x86:${version?} \
-            ownyourbits/nextcloudpi-arm64:${version?}
-          docker manifest push ownyourbits/nextcloudpi:${version?}
-
-      - name: Create manifest and push as latest to docker hub
-        run: |
-          [[ "${{ github.ref }}" =~ ^'refs/tags/'(docker-)?'v'[0-9]+'.'[0-9]+'.'[0-9]+$ ]] || {
-            echo "not tagging latest - is a pre-/beta-release"
-            exit 0
-          }
-          docker manifest create ownyourbits/nextcloudpi:latest \
-          ownyourbits/nextcloudpi-armhf:latest \
-          ownyourbits/nextcloudpi-x86:latest \
-          ownyourbits/nextcloudpi-arm64:latest
-          docker manifest push ownyourbits/nextcloudpi:latest
-
   github-release:
     if: ${{ github.event_name == 'workflow_dispatch' || !startsWith(github.ref_name, 'docker-') }}
     needs:
diff --git a/.github/workflows/vm-tests.yml b/.github/workflows/vm-tests.yml
index 4d61f12b..d01a97bf 100644
--- a/.github/workflows/vm-tests.yml
+++ b/.github/workflows/vm-tests.yml
@@ -153,7 +153,9 @@ jobs:
             version="${version%-*-*}"
           fi
           echo "Previous version is '$version'"
-          echo "PREVIOUS_VERSION=${version}" >> "$GITHUB_ENV"
+          #TODO: Revert to dynamically found version
+          #echo "PREVIOUS_VERSION=${version}" >> "$GITHUB_ENV"
+          echo "PREVIOUS_VERSION=v1.53.3" >> "$GITHUB_ENV"
       - name: Generate ssh key
         run: |
           set -x
@@ -167,7 +169,7 @@ jobs:
           path: /__w/nextcloudpi/nextcloudpi/.ssh
           if-no-files-found: error
       - id: create-test-instance
-        uses: ./.github/actions/create-test-instance
+        uses: ./.github/actions/create-test-instance-bullseye
         with:
           version: "${{ env.PREVIOUS_VERSION }}"
           uid: "${{ env.UID }}"