diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 94bd5ea..780c148 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,33 +19,33 @@ jobs:
       - name: Build an image from Dockerfile
         run: |
           docker build \
-              -t ghcr.io/wonderfall/nextcloud \
-              -t ghcr.io/wonderfall/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6) \
-              -t ghcr.io/wonderfall/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2) \
+              -t ghcr.io/hoellen/nextcloud \
+              -t ghcr.io/hoellen/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6) \
+              -t ghcr.io/hoellen/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2) \
               .
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: 'ghcr.io/wonderfall/nextcloud'
+          image-ref: 'ghcr.io/hoellen/nextcloud'
           format: 'template'
           template: '@/contrib/sarif.tpl'
           output: 'trivy-results.sarif'
           severity: 'CRITICAL,HIGH'
           vuln-type: "os"
 
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: 'trivy-results.sarif'
+#      - name: Upload Trivy scan results to GitHub Security tab
+#        uses: github/codeql-action/upload-sarif@v1
+#        with:
+#          sarif_file: 'trivy-results.sarif'
 
       - name: Docker login
         run: >-
           echo "${{ secrets.GHCR_TOKEN }}"
           | docker login -u "${{ github.actor }}" --password-stdin ghcr.io
-          
+
       - name: Push image to GitHub
         run: |
-          docker push ghcr.io/wonderfall/nextcloud
-          docker push ghcr.io/wonderfall/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6)
-          docker push ghcr.io/wonderfall/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2)
+          docker push ghcr.io/hoellen/nextcloud
+          docker push ghcr.io/hoellen/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6)
+          docker push ghcr.io/hoellen/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2)
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
index 3c56e0b..19b730f 100644
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: 'ghcr.io/wonderfall/nextcloud'
+          image-ref: 'ghcr.io/hoellen/nextcloud'
           format: 'template'
           template: '@/contrib/sarif.tpl'
           output: 'trivy-results.sarif'
diff --git a/Dockerfile b/Dockerfile
index e50de57..3a73138 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -140,6 +140,6 @@ EXPOSE 8888
 
 LABEL description="A server software for creating file hosting services" \
       nextcloud="Nextcloud v${NEXTCLOUD_VERSION}" \
-      maintainer="Wonderfall <wonderfall@targaryen.house>"
+      maintainer="Hoellen <dev@hoellen.eu>"
 
 CMD ["run.sh"]
diff --git a/README.md b/README.md
index cd516f6..70705bc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# wonderfall/nextcloud
+# hoellen/nextcloud
 *The self-hosted productivity platform that keeps you in control.*
 
 Nextcloud [official website](https://nextcloud.com/) and [source code](https://github.com/nextcloud).
@@ -28,7 +28,7 @@ You're free to make your own image based on this one if you want a specific feat
 - `x` : latest Nextcloud x.x (e.g. `21`)
 - `x.x.x` : Nextcloud x.x.x (e.g. `21.0.2`)
 
-You can always have a glance [here](https://github.com/users/Wonderfall/packages/container/package/nextcloud).
+You can always have a glance [here](https://github.com/users/hoellen/packages/container/package/nextcloud).
 Only the **latest stable version** will be maintained by myself.
 
 ## Build-time variables
@@ -45,7 +45,7 @@ Only the **latest stable version** will be maintained by myself.
 | **UID**                     | user id (default: 1000)    |
 | **GID**                     | group id (default: 1000)   |
 
-For convenience they were put at [the very top of the Dockerfile](https://github.com/Wonderfall/docker-nextcloud/blob/main/Dockerfile#L1-L13) and their usage should be quite explicit if you intend to build this image yourself.
+For convenience they were put at [the very top of the Dockerfile](https://github.com/hoellen/docker-nextcloud/blob/master/Dockerfile#L1-L13) and their usage should be quite explicit if you intend to build this image yourself.
 
 ## Environment variables (Dockerfile)
 
@@ -101,7 +101,7 @@ From now on you'll need to make sure all volumes have proper permissions. The de
 Other changes that should be reflected in your configuration files:
 - `/config` volume is now `/nextcloud/config`
 - `/apps2` volume is now `/nextcloud/apps2`
-- `ghcr.io/wonderfall/nextcloud` is the new image location
+- `ghcr.io/hoellen/nextcloud` is the new image location
 
 You should edit your `docker-compose.yml` and `config.php` accordingly.