diff --git a/.github/workflows/master.yml b/.github/workflows/main.yml
similarity index 69%
rename from .github/workflows/master.yml
rename to .github/workflows/main.yml
index 11efd8d8..3bcfd569 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/main.yml
@@ -1,9 +1,9 @@
-name: "master"
+name: "main"
 
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -15,10 +15,13 @@ jobs:
       id: docker_meta_ci
       uses: crazy-max/ghaction-docker-meta@v1
       with:
-        images: solidnerd/bookstack-dev
+        images: registry.scalecity.io/opensource/bookstack-dev
         tag-sha: true
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
+    - name: Read VERSION file
+      id: getversion
+      run: echo "::set-output name=version::$(cat VERSION)"
     - name: Build Image
       uses: docker/build-push-action@v2
       with:
@@ -26,15 +29,17 @@ jobs:
         file: ./Dockerfile
         platforms: linux/amd64
         push: false
+        build-args: |
+          BOOKSTACK_VERSION=${{ steps.getversion.outputs.version }}
         tags: |
           ${{ steps.docker_meta_ci.outputs.tags }}
         labels: ${{ steps.docker_meta_ci.outputs.labels }}
-        cache-from: type=registry,ref=solidnerd/bookstack-dev:master
+        cache-from: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:main
         outputs: type=docker,dest=/tmp/image-bookstack.tar
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
-        name: image-bookstack-master
+        name: image-bookstack-main
         path: /tmp/image-bookstack.tar
         if-no-files-found: warn
   e2e:
@@ -46,7 +51,7 @@ jobs:
     - name: Download artifact
       uses: actions/download-artifact@v2
       with:
-        name: image-bookstack-master
+        name: image-bookstack-main
         path: /tmp
     - name: Load Docker image
       run: |
@@ -62,7 +67,7 @@ jobs:
       id: docker_meta
       uses: crazy-max/ghaction-docker-meta@v1
       with:
-        images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack
+        images: registry.scalecity.io/opensource/bookstack,registry.scalecity.io/opensource/docker-bookstack
         tag-semver: |
           {{version}}
           {{major}}.{{minor}}
@@ -70,7 +75,7 @@ jobs:
     - name: Download artifact
       uses: actions/download-artifact@v2
       with:
-        name: image-bookstack-master
+        name: image-bookstack-main
         path: /tmp
         if-no-files-found: warn
     - name: Load Docker image
@@ -81,27 +86,24 @@ jobs:
       uses: docker/setup-qemu-action@v1
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
-    - name: Login to DockerHub
-      if: github.event_name != 'pull_request'
+    - name: Login to ScaleCity.io Container Registry
       uses: docker/login-action@v1
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v1 
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.CR_PAT }}
+        registry: registry.scalecity.io
+        username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+        password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+    - name: Read VERSION file
+      id: getversion
+      run: echo "::set-output name=version::$(cat VERSION)"
     - name: Build and Push
       uses: docker/build-push-action@v2
       with:
         context: .
         file: ./Dockerfile
+        build-args: |
+          BOOKSTACK_VERSION=${{ steps.getversion.outputs.version }}
         platforms: linux/amd64
         push: ${{ github.event_name != 'pull_request' }}
         tags: |
           ${{ steps.docker_meta.outputs.tags }}
         labels: ${{ steps.docker_meta.outputs.labels }}
-        cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
-        cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index fff73aa4..5228ea66 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -3,7 +3,7 @@ name: "PR"
 on:
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   build:
@@ -15,10 +15,13 @@ jobs:
       id: docker_meta_ci
       uses: crazy-max/ghaction-docker-meta@v1
       with:
-        images: solidnerd/bookstack-dev
+        images: registry.scalecity.io/opensource/bookstack-dev
         tag-sha: true
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
+    - name: Read VERSION file
+      id: getversion
+      run: echo "::set-output name=version::$(cat VERSION)"
     - name: Build and push Dev
       uses: docker/build-push-action@v2
       with:
@@ -29,8 +32,10 @@ jobs:
         tags: |
           ${{ steps.docker_meta_ci.outputs.tags }}
         labels: ${{ steps.docker_meta_ci.outputs.labels }}
-        cache-from: type=registry,ref=solidnerd/bookstack-dev:master
+        cache-from: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:main
         cache-to: type=inline
+        build-args: |
+          BOOKSTACK_VERSION=${{ steps.getversion.outputs.version }}
         outputs: type=docker,dest=/tmp/image-bookstack.tar
     - name: Upload artifact
       uses: actions/upload-artifact@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 71734384..2a53b2fc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,26 +15,31 @@ jobs:
       id: docker_meta_ci
       uses: crazy-max/ghaction-docker-meta@v1
       with:
-        images: solidnerd/bookstack-dev
+        images: registry.scalecity.io/opensource/bookstack-dev
         tag-sha: true
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
+    - name: Read VERSION file
+      id: getversion
+      run: echo "::set-output name=version::$(cat VERSION)"
     - name: Build and push Dev
       uses: docker/build-push-action@v2
       with:
         context: .
         file: ./Dockerfile
         platforms: linux/amd64
+        build-args: |
+          BOOKSTACK_VERSION=${{ steps.getversion.outputs.version }}
         push: false
         tags: |
           ${{ steps.docker_meta_ci.outputs.tags }}
         labels: ${{ steps.docker_meta_ci.outputs.labels }}
-        cache-from: type=registry,ref=solidnerd/bookstack-dev:master
+        cache-from: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:main
         outputs: type=docker,dest=/tmp/image-bookstack.tar
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
-        name: image-bookstack-master
+        name: image-bookstack-main
         path: /tmp/image-bookstack.tar
   e2e:
     runs-on: ubuntu-latest
@@ -45,7 +50,7 @@ jobs:
     - name: Download artifact
       uses: actions/download-artifact@v2
       with:
-        name: image-bookstack-master
+        name: image-bookstack-main
         path: /tmp
     - name: Load Docker image
       run: |
@@ -61,7 +66,7 @@ jobs:
       id: docker_meta
       uses: crazy-max/ghaction-docker-meta@v1
       with:
-        images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack
+        images: registry.scalecity.io/opensource/bookstack,registry.scalecity.io/opensource/docker-bookstack
         tag-semver: |
           {{version}}
           {{major}}.{{minor}}
@@ -69,7 +74,7 @@ jobs:
     - name: Download artifact
       uses: actions/download-artifact@v2
       with:
-        name: image-bookstack-master
+        name: image-bookstack-main
         path: /tmp
     - name: Load Docker image
       run: |
@@ -79,30 +84,27 @@ jobs:
       uses: docker/setup-qemu-action@v1
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
-    - name: Login to DockerHub
-      if: github.event_name != 'pull_request'
+    - name: Login to ScaleCity.io Container Registry
       uses: docker/login-action@v1
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v1 
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.CR_PAT }}
-    - name: Build and Push master
+        registry: registry.scalecity.io
+        username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+        password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+    - name: Read VERSION file
+      id: getversion
+      run: echo "::set-output name=version::$(cat VERSION)"
+    - name: Build and Push main
       uses: docker/build-push-action@v2
       with:
         context: .
         file: ./Dockerfile
+        build-args: |
+          BOOKSTACK_VERSION=${{ steps.getversion.outputs.version }}
         platforms: linux/amd64
         push: ${{ github.event_name != 'pull_request' }}
         tags: |
           ${{ steps.docker_meta.outputs.tags }}
         labels: ${{ steps.docker_meta.outputs.labels }}
-        cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
-        cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
   create-release:
     runs-on: ubuntu-20.04
     needs: push
@@ -110,19 +112,16 @@ jobs:
       # To use this repository's private action, you must check out the repository
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Generate changelog
-        id: changelog
-        uses: metcalfc/changelog-generator@v0.4.4
-        with:
-          myToken: ${{ secrets.GITHUB_TOKEN }}
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1.1.4
+      - name: Build Changelog
+        id: github_release
+        uses: mikepenz/release-changelog-builder-action@v2.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create Release
+        uses: actions/create-release@v1
         with:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
-          body: ${{ steps.changelog.outputs.changelog }}
-          draft: false
-          prerelease: false
+          body: ${{steps.github_release.outputs.changelog}}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 35478f85..00000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-stages:
-- build
-- test
-- image
-build:
-  stage: build
-  before_script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-  script:
-    - docker build -t $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME .
-    - docker push $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
-    - docker rmi $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
-
-release:
-  stage: image
-  before_script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-  script:
-    - docker pull $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
-    - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME $CI_REGISTRY_IMAGE:$(cat VERSION)
-    - docker push $CI_REGISTRY_IMAGE:$(cat VERSION)
-    - docker rmi $CI_REGISTRY_IMAGE:$(cat VERSION)
-    - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME $CI_REGISTRY_IMAGE:latest
-    - docker push $CI_REGISTRY_IMAGE:latest
-    - docker rmi $CI_REGISTRY_IMAGE:latest
-  only:
-    - master
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 00000000..b05db7d7
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,26 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Build all images",
+      "type": "shell",
+      "command": "make build"
+    },
+    {
+      "label": "Pull all images",
+      "type": "shell",
+      "command": "make pull"
+    },
+    {
+      "label": "Push dev images",
+      "type": "shell",
+      "command": "docker login registry.scalecity.io && make push-dev"
+    },
+    {
+      "label": "Test this repo",
+      "type": "shell",
+      "command": "make e2e",
+      "problemMatcher": []
+    }
+  ]
+}
diff --git a/Dockerfile b/Dockerfile
index 21938e7d..ff0e649f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=21.05.2
+ARG BOOKSTACK_VERSION
+ENV BOOKSTACK_VERSION=${BOOKSTACK_VERSION:-21.05.4}
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \
@@ -84,8 +85,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.docker.dockerfile="/Dockerfile" \
       org.label-schema.license="MIT" \
       org.label-schema.name="bookstack" \
-      org.label-schema.vendor="solidnerd" \
-      org.label-schema.url="https://github.com/solidnerd/docker-bookstack/" \
+      org.label-schema.vendor="scalecity" \
+      org.label-schema.url="https://github.com/scalecity/docker-bookstack/" \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/solidnerd/docker-bookstack.git" \
+      org.label-schema.vcs-url="https://github.com/scalecity/docker-bookstack.git" \
       org.label-schema.vcs-type="Git"
diff --git a/LICENSE b/LICENSE
index c2de2d01..0cc45ca8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,8 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Niclas Mietz <hi@solidnerd.dev>
+Copyright for portions of project solidnerd/docker-bookstack are held by Niclas Mietz <hi@solidnerd.dev> 2020 as part of project scalecity/docker-bookstack. All other copyright for project scalecity/docker-bookstack are held by Levi Govaerts <levi@scalecity.io>.
+
+Copyright (c) 2021
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
index 04f6ff2a..26d49196 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-DOCKER_RELEASE_REG=solidnerd
+DOCKER_RELEASE_REG=registry.scalecity.io/opensource
 DOCKER_IMAGE=bookstack
 DOCKER_IMAGE_DEV=${DOCKER_IMAGE}-dev
 DOCKER_INTERNAL_TAG := "sha-$(shell git rev-parse --short HEAD)"
 DOCKER_RELEASE_TAG := $(shell git describe)
 BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
-VCS_URL := https://github.com/solidnerd/docker-bookstack
+VCS_URL := https://github.com/scalecity/docker-bookstack
 
 .PHONY: build  push pull release
 
@@ -13,13 +13,13 @@ build:
 	-t $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) \
 	--build-arg VCS_REF=$(DOCKER_INTERNAL_TAG) \
 	--build-arg BUILD_DATE=$(BUILD_DATE) \
-	--build-arg VCS_URL=$(VCS_URL) 
+	--build-arg VCS_URL=$(VCS_URL)
 
 push-dev:
 	docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG)
 
 pull:
-	docker pull $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) 
+	docker pull $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG)
 
 release:
 	docker tag $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_RELEASE_TAG)
@@ -30,7 +30,7 @@ push-release:
 	docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):latest
 
 
-e2e: 
+e2e:
 	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml up -d
 	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml run --rm sut
 	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml down -v
diff --git a/README.md b/README.md
index b7e441e9..8eb73aca 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
+# Forked from [solidnerd/docker-bookstack](https://github.com/SolidNerd/docker-bookstack)
+
+* Updated to 21.05.3
+
 ## Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack)
 
-[![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com")
+[![Build Status](https://travis-ci.org/scalecity/docker-bookstack.svg?branch=master)](https://travis-ci.org/scalecity/docker-bookstack) [![](https://images.microbadger.com/badges/image/scalecity/bookstack.svg)](https://microbadger.com/images/scalecity/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/scalecity/bookstack.svg)](https://microbadger.com/images/scalecity/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/scalecity/bookstack.svg)](https://microbadger.com/images/scalecity/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/scalecity/bookstack.svg)](https://microbadger.com/images/scalecity/bookstack "Get your own license badge on microbadger.com")
 
-## Current Version: [21.05.2](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
+## Current Version: [21.05.3](https://github.com/ScaleCity/docker-bookstack/blob/master/Dockerfile)
 
 ### Changes
 
@@ -21,7 +25,7 @@ and after that open your Browser and go to [http://localhost:8080](http://localh
 
 ### Issues
 
-If you have any issues feel free to create an [issue on GitHub](https://github.com/solidnerd/docker-bookstack/issues).
+If you have any issues feel free to create an [issue on GitHub](https://github.com/ScaleCity/docker-bookstack/issues).
 
 
 ### How to use the Image without Docker compose
@@ -49,8 +53,8 @@ mysql:5.7.21
 ```bash
 docker run -d --link bookstack_db_:mysql \
 -p 8080:8080 \
---name bookstack_21.05.2 \
-solidnerd/bookstack:21.05.2
+--name bookstack_21.05.3 \
+registry.scalecity.io/opensource/bookstack:21.05.3
 ```
 
 #### Docker 1.9+
@@ -82,8 +86,8 @@ docker run -d --net bookstack_nw \
 -e DB_USERNAME=bookstack \
 -e DB_PASSWORD=secret \
 -p 8080:8080 \
---name="bookstack_21.05.2" \
- solidnerd/bookstack:21.05.2
+--name="bookstack_21.05.3" \
+ registry.scalecity.io/opensource/bookstack:21.05.3
 ```
 
 #### Volumes
diff --git a/VERSION b/VERSION
index e03e87b9..eb3cbfb7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-21.05.2
+21.05.4
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index baa448fd..e2f5b953 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -6,7 +6,7 @@ services:
     depends_on:
     - bookstack
   mysql:
-    image: mysql:5.7.33
+    image: mysql:5.7.35
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack
@@ -16,7 +16,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: ${BOOKSTACK_IMAGE:-solidnerd/bookstack}
+    image: ${BOOKSTACK_IMAGE:-registry.scalecity.io/opensource/bookstack}
     depends_on:
     - mysql
     environment:
@@ -28,7 +28,7 @@ services:
     - uploads:/var/www/bookstack/public/uploads
     - storage-uploads:/var/www/bookstack/storage/uploads
     ports:
-    - "8080:80"
+    - "8181:80"
 
 volumes:
  mysql-data:
diff --git a/docker-compose.yml b/docker-compose.yml
index d48cd9a8..48a6c2d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   mysql:
-    image: mysql:5.7.33
+    image: mysql:5.7.35
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:21.05.2
+    image: registry.scalecity.io/opensource/bookstack:latest
     depends_on:
     - mysql
     environment: