diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 86e0e76..7710348 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Push image
         run: |
           IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
-          
+
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
 
@@ -72,5 +72,7 @@ jobs:
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
 
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+          docker tag "$IMAGE_NAME" "$IMAGE_ID:$VERSION"
+          docker push "$IMAGE_ID:$VERSION"
+          if [ "$VERSION" != "latest" ]; then docker tag "$IMAGE_NAME" "$IMAGE_ID:tagged"; fi
+          if [ "$VERSION" != "latest" ]; then docker push "$IMAGE_ID:tagged"; fi
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
deleted file mode 100644
index 315e831..0000000
--- a/.github/workflows/sonar.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Sonar
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [opened, synchronize, reopened]
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 15
-        uses: actions/setup-java@v1
-        with:
-          java-version: 15
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - name: Cache Maven packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Build and analyze
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
diff --git a/README.md b/README.md
index 9578b7f..fb6973c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![Java CI with Maven](https://github.com/mbuechner/ef2so/workflows/Java%20CI%20with%20Maven/badge.svg) ![Docker](https://github.com/mbuechner/ef2so/workflows/Docker/badge.svg) ![Sonar](https://github.com/mbuechner/ef2so/workflows/Sonar/badge.svg)
+![Java CI with Maven](https://github.com/mbuechner/ef2so/workflows/Java%20CI%20with%20Maven/badge.svg) ![Docker](https://github.com/mbuechner/ef2so/workflows/Docker/badge.svg)
 # EF2SO - An Entity Facts-To-Schema.org Converter
 This is an on-demand [Entity Facts](http://www.dnb.de/entityfacts) (EF) to [Schema.org](https://schema.org/) Converter. That means, that the transformation work will be done in the moment of access! URL schema is `http://www.example.org/yourpath/{GND-IDN}`.
 
@@ -23,9 +23,9 @@ Thanks to  [Jana Hentschke](https://twitter.com/junicatalo) for providing the co
 5. Open Browser, if you're running a local [Tomcat](http://tomcat.apache.org/): http://localhost:8080/118540238
 
 # Docker
-Yes, there's a docker container for EF2SO available at DockerHub. See https://hub.docker.com/r/mbuechner/ef2so
+Yes, there's a docker container for EF2SO available at GitHub. See https://github.com/mbuechner?tab=packages&repo_name=ef2so
 ```
-docker pull mbuechner/ef2so
+docker pull ghcr.io/mbuechner/ef2so/ef2so:latest
 ```
 ## Container build
 1. Checkout GitHub repository: `git clone https://github.com/mbuechner/ef2so`
@@ -74,28 +74,27 @@ First, that depends on your webserver of course! A non-representative benchmark
 
 | %   | HTTP Status Code | Service | URL                                               | LoadTime (ms) |
 |-----|------------------|---------|---------------------------------------------------|---------------|
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/100025250 | 520           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/100000193 | 472           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/100001394 | 555           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/100000355 | 483           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/140585524 | 569           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/100054102 | 659           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/118577182 | 543           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/100014704 | 601           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/118540238 | 629           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/118505556 | 589           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/106220063 | 659           |
-| 100 | 200              | EF      | http://hub.culturegraph.org/entityfacts/100001467 | 600           |
-| 100 | 501              | EF2SO   | https://labs.ddb.de/app/ef2so/118505556           | 719           |
-| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100000355           | 752           |
-| 100 | 501              | EF2SO   | https://labs.ddb.de/app/ef2so/140585524           | 854           |
-| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100001394           | 777           |
-| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/106220063           | 736           |
-| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100000193           | 775           |
-| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/118540238           | 673           |
-| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100054102           | 736           |
-| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100025250           | 768           |
-| 100 | 501              | EF2SO   | https://labs.ddb.de/app/ef2so/118577182           | 811           |
-| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100001467           | 725           |
-| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100014704           | 861           |
-
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/100025250 | 520           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/100000193 | 472           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/100001394 | 555           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/100000355 | 483           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/140585524 | 569           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/100054102 | 659           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/118577182 | 543           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/100014704 | 601           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/118540238 | 629           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/118505556 | 589           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/106220063 | 659           |
+| 100 | 200              | EF      | https://hub.culturegraph.org/entityfacts/100001467 | 600           |
+| 100 | 501              | EF2SO   | https://labs.ddb.de/app/ef2so/118505556            | 719           |
+| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100000355            | 752           |
+| 100 | 501              | EF2SO   | https://labs.ddb.de/app/ef2so/140585524            | 854           |
+| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100001394            | 777           |
+| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/106220063            | 736           |
+| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100000193            | 775           |
+| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/118540238            | 673           |
+| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100054102            | 736           |
+| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100025250            | 768           |
+| 100 | 501              | EF2SO   | https://labs.ddb.de/app/ef2so/118577182            | 811           |
+| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100001467            | 725           |
+| 100 | 200              | EF2SO   | https://labs.ddb.de/app/ef2so/100014704            | 861           |