diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 2c7d1708..00000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 2
-updates:
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index f58ecd39..00000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 30
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - keep-alive
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  any activity for the last 30 days. It will be closed if no further activity
-  occurs during the next 7 days. Thank you for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
deleted file mode 100644
index 11efd8d8..00000000
--- a/.github/workflows/master.yml
+++ /dev/null
@@ -1,107 +0,0 @@
-name: "master"
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up CI Image Metadata
-      id: docker_meta_ci
-      uses: crazy-max/ghaction-docker-meta@v1
-      with:
-        images: solidnerd/bookstack-dev
-        tag-sha: true
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - name: Build Image
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./Dockerfile
-        platforms: linux/amd64
-        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
-        outputs: type=docker,dest=/tmp/image-bookstack.tar
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: image-bookstack-master
-        path: /tmp/image-bookstack.tar
-        if-no-files-found: warn
-  e2e:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Download artifact
-      uses: actions/download-artifact@v2
-      with:
-        name: image-bookstack-master
-        path: /tmp
-    - name: Load Docker image
-      run: |
-        docker load --input /tmp/image-bookstack.tar
-        docker image ls -a
-  push:
-    runs-on: ubuntu-20.04
-    needs: e2e
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name:  Set up Docker Hub Image Metadata
-      id: docker_meta
-      uses: crazy-max/ghaction-docker-meta@v1
-      with:
-        images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack
-        tag-semver: |
-          {{version}}
-          {{major}}.{{minor}}
-          {{major}}.{{minor}}.{{patch}}
-    - name: Download artifact
-      uses: actions/download-artifact@v2
-      with:
-        name: image-bookstack-master
-        path: /tmp
-        if-no-files-found: warn
-    - name: Load Docker image
-      run: |
-        docker load --input /tmp/image-bookstack.tar
-        docker image ls -a
-    - name: Set up QEMU
-      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'
-      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
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./Dockerfile
-        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
deleted file mode 100644
index fff73aa4..00000000
--- a/.github/workflows/pr.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: "PR"
-
-on:
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Docker meta ci
-      id: docker_meta_ci
-      uses: crazy-max/ghaction-docker-meta@v1
-      with:
-        images: solidnerd/bookstack-dev
-        tag-sha: true
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - name: Build and push Dev
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./Dockerfile
-        platforms: linux/amd64
-        push: ${{ github.event_name != 'pull_request' }}
-        tags: |
-          ${{ steps.docker_meta_ci.outputs.tags }}
-        labels: ${{ steps.docker_meta_ci.outputs.labels }}
-        cache-from: type=registry,ref=solidnerd/bookstack-dev:master
-        cache-to: type=inline
-        outputs: type=docker,dest=/tmp/image-bookstack.tar
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: image-bookstack
-        path: /tmp/image-bookstack.tar
-        if-no-files-found: warn
-  e2e:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Download artifact
-      uses: actions/download-artifact@v2
-      with:
-        name: image-bookstack
-        path: /tmp
-        if-no-files-found: warn
-    - name: Load Docker image
-      run: |
-        docker load --input /tmp/image-bookstack.tar
-        docker image ls -a
-    - name: Execute End-to-End Test
-      run: make e2e
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 71734384..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-name: release
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - '*' # Push events to matching v*, i.e. v1.0, v0.4.4
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up CI Image Metadata
-      id: docker_meta_ci
-      uses: crazy-max/ghaction-docker-meta@v1
-      with:
-        images: solidnerd/bookstack-dev
-        tag-sha: true
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - name: Build and push Dev
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./Dockerfile
-        platforms: linux/amd64
-        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
-        outputs: type=docker,dest=/tmp/image-bookstack.tar
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: image-bookstack-master
-        path: /tmp/image-bookstack.tar
-  e2e:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Download artifact
-      uses: actions/download-artifact@v2
-      with:
-        name: image-bookstack-master
-        path: /tmp
-    - name: Load Docker image
-      run: |
-        docker load --input /tmp/image-bookstack.tar
-        docker image ls -a
-  push:
-    runs-on: ubuntu-20.04
-    needs: e2e
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name:  Set up Docker Hub Image Metadata
-      id: docker_meta
-      uses: crazy-max/ghaction-docker-meta@v1
-      with:
-        images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack
-        tag-semver: |
-          {{version}}
-          {{major}}.{{minor}}
-          {{major}}.{{minor}}.{{patch}}
-    - name: Download artifact
-      uses: actions/download-artifact@v2
-      with:
-        name: image-bookstack-master
-        path: /tmp
-    - name: Load Docker image
-      run: |
-        docker load --input /tmp/image-bookstack.tar
-        docker image ls -a
-    - name: Set up QEMU
-      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'
-      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
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./Dockerfile
-        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
-    steps:
-      # 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
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          body: ${{ steps.changelog.outputs.changelog }}
-          draft: false
-          prerelease: false
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35478f85..00e4ba46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,26 +2,54 @@ stages:
 - build
 - test
 - image
+
+image: docker:19-git
+
 build:
   stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  tags:
+    - docker
   before_script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
   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
+    - >
+      /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile
+      --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+      --build-arg VCS_REF="$CI_COMMIT_SHA" --build-arg BUILD_DATE="$CI_JOB_STARTED_AT"
+      --cache --cache-dir=/cache --cache-repo=${CI_REGISTRY_IMAGE}/testing
+  after_script:
+    - rm -f /kaniko/.docker/config.json
 
 release:
   stage: image
+  environment: release
+  tags:
+    - docker
+  services:
+    - docker:19-dind
   before_script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
+    - mkdir -p /root/.docker
+    - DH_AUTH=$(echo -n "${DH_USERNAME}:${DH_PASSWORD}" | base64)
+    - >
+      echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},
+      \"https://index.docker.io/v1/\":{\"auth\":\"$DH_AUTH\"}}}" > /root/.docker/config.json
   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 pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME $DH_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:latest
+    - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME $DH_REGISTRY_IMAGE:latest
+    - docker push $DH_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
     - docker push $CI_REGISTRY_IMAGE:latest
+    - docker push $DH_REGISTRY_IMAGE:latest
+    - docker rmi $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - docker rmi $DH_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
     - docker rmi $CI_REGISTRY_IMAGE:latest
+    - docker rmi $DH_REGISTRY_IMAGE:latest
+  after_script:
+    - rm -f /root/.docker/config.json
   only:
-    - master
+    - tags
diff --git a/Dockerfile b/Dockerfile
index 112593ab..b8378725 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,14 @@
+ARG BOOKSTACK_VERSION=24.10
+ARG COMPOSER_VERSION=2.6.5
+ARG BUILD_DATE
+ARG VCS_REF
+
+# Container used to get the bookstack code and extract it
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=0.31.6
+# Renew needed ARGS
+ARG BOOKSTACK_VERSION
+# Setup needed environment variables
+ENV BOOKSTACK_VERSION=${BOOKSTACK_VERSION}
 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  \
@@ -7,7 +16,17 @@ RUN set -x; \
     && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \
     && rm bookstack.tar.gz
 
-FROM php:7.4-apache-buster as final
+# Actual container used for running bookstack
+FROM php:8.2-apache-bookworm as final
+# Renew our ARGS
+ARG BOOKSTACK_VERSION
+ARG COMPOSER_VERSION
+ARG BUILD_DATE
+ARG VCS_REF
+# Setup our ENVS
+ENV BOOKSTACK_VERSION=${BOOKSTACK_VERSION}
+ENV COMPOSER_VERSION=${COMPOSER_VERSION}
+
 RUN set -x; \
     apt-get update \
     && apt-get install -y --no-install-recommends \
@@ -22,13 +41,17 @@ RUN set -x; \
         libxml2-dev  \
         fontconfig  \
         fonts-freefont-ttf   \
-        wkhtmltopdf  \
         tar \
         curl \
+        wget \
         libzip-dev \
         unzip \
     \
-   && docker-php-ext-install -j$(nproc) dom pdo pdo_mysql zip tidy  \
+   && wget -O /wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb  \
+   && chmod a+x /wkhtmltox.deb \
+   && apt-get install -y /wkhtmltox.deb \
+   && rm /wkhtmltox.deb \
+   && docker-php-ext-install -j$(nproc) dom pdo pdo_mysql zip tidy xml \
    && docker-php-ext-configure ldap \
    && docker-php-ext-install -j$(nproc) ldap \
    && docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \
@@ -51,24 +74,32 @@ COPY bookstack.conf /etc/apache2/sites-available/000-default.conf
 
 COPY --from=bookstack --chown=33:33 /bookstack/ /var/www/bookstack/
 
-ARG COMPOSER_VERSION=1.10.16
-RUN set -x; \
-    cd /var/www/bookstack \
-    && curl -sS https://getcomposer.org/installer | php -- --version=$COMPOSER_VERSION \
-    && /var/www/bookstack/composer.phar global -v require hirak/prestissimo \
-    && /var/www/bookstack/composer.phar install -v -d /var/www/bookstack/ \
-    && /var/www/bookstack/composer.phar global -v remove hirak/prestissimo \
-    && rm -rf /var/www/bookstack/composer.phar /root/.composer \
-    && chown -R www-data:www-data /var/www/bookstack
-
-COPY php.ini /usr/local/etc/php/php.ini
+COPY php.ini /usr/local/etc/php/conf.d/docker-bookstack-default.ini
+
 COPY docker-entrypoint.sh /bin/docker-entrypoint.sh
 
-WORKDIR /var/www/bookstack
+RUN cd /var/www/bookstack \
+    && mkdir /var/www/.composer \
+    && chown -R www-data:www-data /usr/local/etc/php/conf.d/ /var/www/bookstack /var/www/.composer \
+    && mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
+    && sed -i 's/memory_limit = 128M/memory_limit = 512M/g' "$PHP_INI_DIR/php.ini"
+
+# Install composer
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php composer-setup.php \
+    && mv composer.phar /usr/bin/composer \
+    && chmod +x /usr/bin/composer \
+    && php -r "unlink('composer-setup.php');" 
 
 # www-data
 USER 33
 
+# Install deps
+RUN cd /var/www/bookstack \
+    && /usr/bin/composer install -v -d /var/www/bookstack/ 
+
+WORKDIR /var/www/bookstack
+
 VOLUME ["/var/www/bookstack/public/uploads","/var/www/bookstack/storage/uploads"]
 
 ENV RUN_APACHE_USER=www-data \
@@ -78,14 +109,12 @@ EXPOSE 8080
 
 ENTRYPOINT ["/bin/docker-entrypoint.sh"]
 
-ARG BUILD_DATE
-ARG VCS_REF
 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="digitalmotion" \
+      org.label-schema.url="https://github.com/DigitalMotionTech/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/DigitalMotionTech/docker-bookstack.git" \
       org.label-schema.vcs-type="Git"
diff --git a/Makefile b/Makefile
index 04f6ff2a..9aff9717 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-DOCKER_RELEASE_REG=solidnerd
-DOCKER_IMAGE=bookstack
-DOCKER_IMAGE_DEV=${DOCKER_IMAGE}-dev
+DOCKER_RELEASE_REG=registry.gitlab.com/digitalmotion/os
+DOCKER_IMAGE=docker-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/DigitalMotionTech/docker-bookstack
 
 .PHONY: build  push pull release
 
diff --git a/README.md b/README.md
index 12d0cdb0..6c986ab0 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
 ## 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")
-
-## Current Version: [0.31.6](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
+[![Pipeline Status](https://gitlab.com/DigitalMotion/os/docker-bookstack/badges/master/pipeline.svg)](https://gitlab.com/DigitalMotion/os/docker-bookstack/-/pipelines)
+## Current Version: [22.04.2](https://github.com/DigitalMotionTech/docker-bookstack/blob/master/Dockerfile)
 
 ### Changes
-
+In 21.05 we moved to composer 2.x and did alot of code and build cleanup - moving image creation over to Kaniko.
 In 0.28.0 we changed the container http port from 80 to 8080 to allow root privileges to be dropped
 In 0.12.2 we removed `DB_PORT` . You can now specify the port via `DB_HOST` like `DB_HOST=mysql:3306`
 
@@ -21,7 +19,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/DigitalMotionTech/docker-bookstack/issues).
 
 
 ### How to use the Image without Docker compose
@@ -100,4 +98,4 @@ After these steps you can visit [http://localhost:8080](http://localhost:8080) .
 
 ### Inspiration
 
-This is a fork of [Kilhog/docker-bookstack](https://github.com/Kilhog/docker-bookstack). Kilhog did the intial work, but I want to go in a different direction.
+This is a fork of [solidnerd/docker-bookstack](https://github.com/solidnert/docker-bookstack).
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 46214d1f..00000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.31.6
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 6a2455fa..88b75c2e 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -77,7 +77,9 @@ if [ ! -f ".env" ]; then
       MAIL_USERNAME=${MAIL_USERNAME:-null}
       MAIL_PASSWORD=${MAIL_PASSWORD:-null}
       MAIL_ENCRYPTION=${MAIL_ENCRYPTION:-null}
-      # URL used for social login redirects, NO TRAILING SLASH
+      
+      # Setup for PDF Printing
+      WKHTMLTOPDF=/usr/local/bin/wkhtmltopdf
 EOF
     else
         echo >&2 'error: missing DB_HOST environment variable'
@@ -102,6 +104,10 @@ else
   echoerr "wait-for-db: timeout out after 15 seconds waiting for ${DB_HOST_NAME}:${DB_PORT}"
 fi
 
+if [ ! -z $MAX_UPLOAD_SIZE ]; then
+  echo -e "[PHP]\npost_max_size = ${MAX_UPLOAD_SIZE}\nupload_max_filesize = ${MAX_UPLOAD_SIZE}\n" > /usr/local/etc/php/conf.d/zbookstack-max-upload.ini
+fi
+
 echo "Generating Key..."
 php artisan key:generate --show
 
