diff --git a/Dockerfile b/Dockerfile
index 47049c8..33bc0d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
 
 # set version label
 ARG BUILD_DATE
@@ -11,63 +11,54 @@ LABEL maintainer="homerr"
 ARG BOOKSTACK_RELEASE
 
 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache  \
-	curl \
-	fontconfig \
-	memcached \
-	netcat-openbsd \
-	php7-ctype \
-	php7-curl \
-	php7-dom \
-	php7-gd \
-	php7-ldap \
-	php7-mbstring \
-	php7-memcached \
-	php7-mysqlnd \
-	php7-openssl \
-	php7-pdo_mysql \
-	php7-phar \
-	php7-simplexml \
-	php7-tokenizer \
-	qt5-qtbase \
-	tar \
-	ttf-freefont \
-	wkhtmltopdf && \
- echo "**** tidy bug fix ****" && \
- curl -s \
-	http://dl-cdn.alpinelinux.org/alpine/v3.7/community/x86_64/tidyhtml-libs-5.4.0-r0.apk | \
-	tar xfz - -C / && \
- rm -f /usr/lib/libtidy.so.5.6.0 && \
- echo "**** configure php-fpm ****" && \
- sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
- echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
- echo "**** fetch bookstack ****" && \
- mkdir -p\
-	/var/www/html && \
- if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
-	BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/bookstack.tar.gz -L \
-	"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/bookstack.tar.gz -C \
-	/var/www/html/ --strip-components=1 && \
- echo "**** install  composer ****" && \
- cd /tmp && \
- curl -sS https://getcomposer.org/installer | php && \
- mv /tmp/composer.phar /usr/local/bin/composer && \
- echo "**** install composer dependencies ****" && \
- composer install -d /var/www/html/ && \
- echo "**** cleanup ****" && \
- rm -rf \
-	/root/.composer \
-	/tmp/*
+  echo "**** install packages ****" && \
+  apk add --no-cache  \
+    curl \
+    composer \
+    fontconfig \
+    memcached \
+    netcat-openbsd \
+    php7-ctype \
+    php7-curl \
+    php7-dom \
+    php7-gd \
+    php7-ldap \
+    php7-mbstring \
+    php7-memcached \
+    php7-mysqlnd \
+    php7-openssl \
+    php7-pdo_mysql \
+    php7-phar \
+    php7-simplexml \
+    php7-tokenizer \
+    qt5-qtbase \
+    tar \
+    ttf-freefont \
+    wkhtmltopdf && \
+  echo "**** configure php-fpm ****" && \
+  sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
+  echo "**** fetch bookstack ****" && \
+  mkdir -p\
+    /var/www/html && \
+  if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
+    BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  curl -o \
+  /tmp/bookstack.tar.gz -L \
+    "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
+  tar xf \
+  /tmp/bookstack.tar.gz -C \
+    /var/www/html/ --strip-components=1 && \
+  echo "**** install composer dependencies ****" && \
+  composer install -d /var/www/html/ && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /root/.composer \
+    /tmp/*
 
-# copy local files
 COPY root/ /
 
-# ports and volumes
 VOLUME /config
+EXPOSE 80
\ No newline at end of file
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 9839e58..201c014 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
 
 # set version label
 ARG BUILD_DATE
@@ -11,63 +11,54 @@ LABEL maintainer="homerr"
 ARG BOOKSTACK_RELEASE
 
 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache  \
-	curl \
-	fontconfig \
-	memcached \
-	netcat-openbsd \
-	php7-ctype \
-	php7-curl \
-	php7-dom \
-	php7-gd \
-	php7-ldap \
-	php7-mbstring \
-	php7-memcached \
-	php7-mysqlnd \
-	php7-openssl \
-	php7-pdo_mysql \
-	php7-phar \
-	php7-simplexml \
-	php7-tokenizer \
-	qt5-qtbase \
-	tar \
-	ttf-freefont \
-	wkhtmltopdf && \
- echo "**** tidy bug fix ****" && \
- curl -s \
-	http://dl-cdn.alpinelinux.org/alpine/v3.7/community/aarch64/tidyhtml-libs-5.4.0-r0.apk | \
-	tar xfz - -C / && \
- rm -f /usr/lib/libtidy.so.5.6.0 && \
- echo "**** configure php-fpm ****" && \
- sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
- echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
- echo "**** fetch bookstack ****" && \
- mkdir -p\
-	/var/www/html && \
- if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
-	BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/bookstack.tar.gz -L \
-	"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/bookstack.tar.gz -C \
-	/var/www/html/ --strip-components=1 && \
- echo "**** install  composer ****" && \
- cd /tmp && \
- curl -sS https://getcomposer.org/installer | php && \
- mv /tmp/composer.phar /usr/local/bin/composer && \
- echo "**** install composer dependencies ****" && \
- composer install -d /var/www/html/ && \
- echo "**** cleanup ****" && \
- rm -rf \
-	/root/.composer \
-	/tmp/*
+  echo "**** install packages ****" && \
+  apk add --no-cache  \
+    curl \
+    composer \
+    fontconfig \
+    memcached \
+    netcat-openbsd \
+    php7-ctype \
+    php7-curl \
+    php7-dom \
+    php7-gd \
+    php7-ldap \
+    php7-mbstring \
+    php7-memcached \
+    php7-mysqlnd \
+    php7-openssl \
+    php7-pdo_mysql \
+    php7-phar \
+    php7-simplexml \
+    php7-tokenizer \
+    qt5-qtbase \
+    tar \
+    ttf-freefont \
+    wkhtmltopdf && \
+  echo "**** configure php-fpm ****" && \
+  sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
+  echo "**** fetch bookstack ****" && \
+  mkdir -p\
+    /var/www/html && \
+  if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
+    BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  curl -o \
+  /tmp/bookstack.tar.gz -L \
+    "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
+  tar xf \
+  /tmp/bookstack.tar.gz -C \
+    /var/www/html/ --strip-components=1 && \
+  echo "**** install composer dependencies ****" && \
+  composer install -d /var/www/html/ && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /root/.composer \
+    /tmp/*
 
-# copy local files
 COPY root/ /
 
-# ports and volumes
 VOLUME /config
+EXPOSE 80
\ No newline at end of file
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index e6eab63..d42b146 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
 
 # set version label
 ARG BUILD_DATE
@@ -11,58 +11,54 @@ LABEL maintainer="homerr"
 ARG BOOKSTACK_RELEASE
 
 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache  \
-	curl \
-	fontconfig \
-	memcached \
-	netcat-openbsd \
-	php7-ctype \
-	php7-curl \
-	php7-dom \
-	php7-gd \
-	php7-ldap \
-	php7-mbstring \
-	php7-memcached \
-	php7-mysqlnd \
-	php7-openssl \
-	php7-pdo_mysql \
-	php7-phar \
-	php7-simplexml \
-	php7-tokenizer \
-	qt5-qtbase \
-	tar \
-	ttf-freefont \
-	wkhtmltopdf && \
- echo "**** configure php-fpm ****" && \
- sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
- echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
- echo "**** fetch bookstack ****" && \
- mkdir -p\
-	/var/www/html && \
- if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
-	BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- curl -o \
- /tmp/bookstack.tar.gz -L \
-	"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/bookstack.tar.gz -C \
-	/var/www/html/ --strip-components=1 && \
- echo "**** install  composer ****" && \
- cd /tmp && \
- curl -sS https://getcomposer.org/installer | php && \
- mv /tmp/composer.phar /usr/local/bin/composer && \
- echo "**** install composer dependencies ****" && \
- composer install -d /var/www/html/ && \
- echo "**** cleanup ****" && \
- rm -rf \
-	/root/.composer \
-	/tmp/*
+  echo "**** install packages ****" && \
+  apk add --no-cache  \
+    curl \
+    composer \
+    fontconfig \
+    memcached \
+    netcat-openbsd \
+    php7-ctype \
+    php7-curl \
+    php7-dom \
+    php7-gd \
+    php7-ldap \
+    php7-mbstring \
+    php7-memcached \
+    php7-mysqlnd \
+    php7-openssl \
+    php7-pdo_mysql \
+    php7-phar \
+    php7-simplexml \
+    php7-tokenizer \
+    qt5-qtbase \
+    tar \
+    ttf-freefont \
+    wkhtmltopdf && \
+  echo "**** configure php-fpm ****" && \
+  sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
+  echo "**** fetch bookstack ****" && \
+  mkdir -p\
+    /var/www/html && \
+  if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
+    BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  curl -o \
+  /tmp/bookstack.tar.gz -L \
+    "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
+  tar xf \
+  /tmp/bookstack.tar.gz -C \
+    /var/www/html/ --strip-components=1 && \
+  echo "**** install composer dependencies ****" && \
+  composer install -d /var/www/html/ && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /root/.composer \
+    /tmp/*
 
-# copy local files
 COPY root/ /
 
-# ports and volumes
 VOLUME /config
+EXPOSE 80
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index f6fec88..c517c0b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,7 @@ pipeline {
     DIST_IMAGE = 'alpine'
     MULTIARCH = 'true'
     CI = 'true'
-    CI_WEB = 'false'
+    CI_WEB = 'true'
     CI_PORT = '80'
     CI_SSL = 'false'
     CI_DELAY = '30'
diff --git a/README.md b/README.md
index 6cf2779..997006f 100644
--- a/README.md
+++ b/README.md
@@ -269,6 +269,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **11.07.21:** - Rebase to Alpine 3.14.
 * **12.01.21:** - Remove unused requirement, as of release 0.31.0.
 * **17.12.20:** - Make APP_URL var required (upstream changes).
 * **17.09.20:** - Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default.
diff --git a/readme-vars.yml b/readme-vars.yml
index 2183b26..e176dbd 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -101,6 +101,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "11.07.21:", desc: "Rebase to Alpine 3.14." }
   - { date: "12.01.21:", desc: "Remove unused requirement, as of release 0.31.0." }
   - { date: "17.12.20:", desc: "Make APP_URL var required (upstream changes)." }
   - { date: "17.09.20:", desc: "Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default." }