diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fc717978..7f0808a2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,8 +13,7 @@ jobs:
     name: Test the app
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout source
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Node.js ${{ env.NV }}
         uses: actions/setup-node@v1
         with:
@@ -28,8 +27,7 @@ jobs:
     name: Build the app
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout source
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Node.js ${{ env.NV }}
         uses: actions/setup-node@v1
         with:
@@ -69,11 +67,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags')
     steps:
-      - name: Checkout source
-        uses: actions/checkout@v1
+      - uses: actions/checkout@v3
         with:
-          fetch-depth: 50
-      - name: Build and publish image
-        run: |
-          echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
-          make publish-beol-image
+          fetch-depth: 0
+      - uses: docker/setup-buildx-action@v2
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - run: make publish-beol-image
diff --git a/Dockerfile b/Dockerfile
index 7a378a78..b46fe590 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,7 @@
 # We label our stage as 'builder'
 FROM node:12-stretch as builder
 
-LABEL maintainer="ivan.subotic@unibas.ch"
-
-# The qq is for silent output in the console
-# You are welcome to modify this part as it
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev
+LABEL maintainer="support@dasch.swiss"
 
 # Sets the path where the app is going to be installed
 ENV NODE_ROOT /usr/app/
@@ -33,7 +29,7 @@ RUN npm run build-prod
 
 FROM daschswiss/nginx-server:v1.1.1
 
-LABEL maintainer="400790+subotic@users.noreply.github.com"
+LABEL maintainer="support@dasch.swiss"
 
 RUN rm -rf /public/*
 
diff --git a/Makefile b/Makefile
index 5b4ff316..885bb3ba 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,11 @@ include vars.mk
 #################################
 .PHONY: build-beol-image
 build-beol-image: ## build BEOL APP image locally
-	docker build -t $(BEOL_IMAGE) .
-	docker tag $(BEOL_IMAGE) $(BEOL_REPO):latest
+	docker buildx build --platform linux/amd64 -t $(BEOL_IMAGE) -t $(BEOL_REPO):latest --load .
 
 .PHONY: publish-beol-image
 publish-beol-image: build-beol-image ## publish BEOL APP Docker image to Docker-Hub
-	docker image push --all-tags $(BEOL_REPO)
+	docker buildx build --platform linux/amd64 -t $(BEOL_IMAGE) -t $(BEOL_REPO):latest --push .
 
 .PHONY: help
 help: ## this help
diff --git a/src/app/landing-page/landing-page.component.html b/src/app/landing-page/landing-page.component.html
index c184ed34..31f5e0f9 100644
--- a/src/app/landing-page/landing-page.component.html
+++ b/src/app/landing-page/landing-page.component.html
@@ -184,8 +184,8 @@ <h3 mat-card-subtitle>Feedback</h3>
             <br/>
             <h3 mat-card-subtitle>Impressum</h3>
             <p class="impressum">
-                <a rel="license" href="https://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons Licence" class="ccIcon" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a>
-                The contents on our website are licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>.
+                <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons Licence" class="ccIcon" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>
+                The contents on our website are licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
             </p>
         </section>