diff --git a/Dockerfile b/Dockerfile
index 6063220..4aeedae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.13
+FROM ghcr.io/linuxserver/baseimage-alpine:3.14
 
 # set version label
 ARG BUILD_DATE
@@ -11,43 +11,42 @@ LABEL maintainer="nemchik"
 ENV HOME="/config"
 
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	curl \
-	g++ \
-	make \
-	python3 && \
- echo "**** symlink python3 for compatibility ****" && \
- ln -s /usr/bin/python3 /usr/bin/python && \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	yarn && \
- if [ -z ${OVERSEERR_VERSION+x} ]; then \
-	OVERSEERR_VERSION=$(curl -sX GET "https://api.github.com/repos/sct/overseerr/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- export COMMIT_TAG="${OVERSEERR_VERSION}" && \
- curl -o \
-	/tmp/overseerr.tar.gz -L \
-	"https://github.com/sct/overseerr/archive/${OVERSEERR_VERSION}.tar.gz" && \
- mkdir -p /app/overseerr && \
- tar xzf \
-	/tmp/overseerr.tar.gz -C \
-	/app/overseerr/ --strip-components=1 && \
- cd /app/overseerr && \
- NODE_OPTIONS=--max_old_space_size=1024 && \
- export NODE_OPTIONS && \
- yarn --frozen-lockfile --network-timeout 1000000 && \
- yarn build && \
- yarn install --production --ignore-scripts --prefer-offline && \
- yarn cache clean && \
- echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \
- rm -rf /app/overseerr/config && \
- ln -s /config /app/overseerr/config && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    curl \
+    g++ \
+    make \
+    python3 && \
+  echo "**** symlink python3 for compatibility ****" && \
+  ln -s /usr/bin/python3 /usr/bin/python && \
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
+    yarn && \
+  if [ -z ${OVERSEERR_VERSION+x} ]; then \
+    OVERSEERR_VERSION=$(curl -sX GET "https://api.github.com/repos/sct/overseerr/releases/latest" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  export COMMIT_TAG="${OVERSEERR_VERSION}" && \
+  curl -o \
+    /tmp/overseerr.tar.gz -L \
+    "https://github.com/sct/overseerr/archive/${OVERSEERR_VERSION}.tar.gz" && \
+  mkdir -p /app/overseerr && \
+  tar xzf \
+    /tmp/overseerr.tar.gz -C \
+    /app/overseerr/ --strip-components=1 && \
+  cd /app/overseerr && \
+  export NODE_OPTIONS=--max_old_space_size=2048 && \
+  yarn --frozen-lockfile --network-timeout 1000000 && \
+  yarn build && \
+  yarn install --production --ignore-scripts --prefer-offline && \
+  yarn cache clean && \
+  echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \
+  rm -rf /app/overseerr/config && \
+  ln -s /config /app/overseerr/config && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
     /root/.cache \
     /tmp/*
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 9d39543..9693835 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
 
 # set version label
 ARG BUILD_DATE
@@ -11,43 +11,42 @@ LABEL maintainer="nemchik"
 ENV HOME="/config"
 
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	curl \
-	g++ \
-	make \
-	python3 && \
- echo "**** symlink python3 for compatibility ****" && \
- ln -s /usr/bin/python3 /usr/bin/python && \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	yarn && \
- if [ -z ${OVERSEERR_VERSION+x} ]; then \
-	OVERSEERR_VERSION=$(curl -sX GET "https://api.github.com/repos/sct/overseerr/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- export COMMIT_TAG="${OVERSEERR_VERSION}" && \
- curl -o \
-	/tmp/overseerr.tar.gz -L \
-	"https://github.com/sct/overseerr/archive/${OVERSEERR_VERSION}.tar.gz" && \
- mkdir -p /app/overseerr && \
- tar xzf \
-	/tmp/overseerr.tar.gz -C \
-	/app/overseerr/ --strip-components=1 && \
- cd /app/overseerr && \
- NODE_OPTIONS=--max_old_space_size=1024 && \
- export NODE_OPTIONS && \
- yarn --frozen-lockfile --network-timeout 1000000 && \
- yarn build && \
- yarn install --production --ignore-scripts --prefer-offline && \
- yarn cache clean && \
- echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \
- rm -rf /app/overseerr/config && \
- ln -s /config /app/overseerr/config && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    curl \
+    g++ \
+    make \
+    python3 && \
+  echo "**** symlink python3 for compatibility ****" && \
+  ln -s /usr/bin/python3 /usr/bin/python && \
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
+    yarn && \
+  if [ -z ${OVERSEERR_VERSION+x} ]; then \
+    OVERSEERR_VERSION=$(curl -sX GET "https://api.github.com/repos/sct/overseerr/releases/latest" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  export COMMIT_TAG="${OVERSEERR_VERSION}" && \
+  curl -o \
+    /tmp/overseerr.tar.gz -L \
+    "https://github.com/sct/overseerr/archive/${OVERSEERR_VERSION}.tar.gz" && \
+  mkdir -p /app/overseerr && \
+  tar xzf \
+    /tmp/overseerr.tar.gz -C \
+    /app/overseerr/ --strip-components=1 && \
+  cd /app/overseerr && \
+  export NODE_OPTIONS=--max_old_space_size=2048 && \
+  yarn --frozen-lockfile --network-timeout 1000000 && \
+  yarn build && \
+  yarn install --production --ignore-scripts --prefer-offline && \
+  yarn cache clean && \
+  echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \
+  rm -rf /app/overseerr/config && \
+  ln -s /config /app/overseerr/config && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
     /root/.cache \
     /tmp/*
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index b62fcfc..e4e5cb0 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
 
 # set version label
 ARG BUILD_DATE
@@ -11,43 +11,42 @@ LABEL maintainer="nemchik"
 ENV HOME="/config"
 
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	curl \
-	g++ \
-	make \
-	python3 && \
- echo "**** symlink python3 for compatibility ****" && \
- ln -s /usr/bin/python3 /usr/bin/python && \
- echo "**** install runtime packages ****" && \
- apk add --no-cache \
-	yarn && \
- if [ -z ${OVERSEERR_VERSION+x} ]; then \
-	OVERSEERR_VERSION=$(curl -sX GET "https://api.github.com/repos/sct/overseerr/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- export COMMIT_TAG="${OVERSEERR_VERSION}" && \
- curl -o \
-	/tmp/overseerr.tar.gz -L \
-	"https://github.com/sct/overseerr/archive/${OVERSEERR_VERSION}.tar.gz" && \
- mkdir -p /app/overseerr && \
- tar xzf \
-	/tmp/overseerr.tar.gz -C \
-	/app/overseerr/ --strip-components=1 && \
- cd /app/overseerr && \
- NODE_OPTIONS=--max_old_space_size=1024 && \
- export NODE_OPTIONS && \
- yarn --frozen-lockfile --network-timeout 1000000 && \
- yarn build && \
- yarn install --production --ignore-scripts --prefer-offline && \
- yarn cache clean && \
- echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \
- rm -rf /app/overseerr/config && \
- ln -s /config /app/overseerr/config && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    curl \
+    g++ \
+    make \
+    python3 && \
+  echo "**** symlink python3 for compatibility ****" && \
+  ln -s /usr/bin/python3 /usr/bin/python && \
+  echo "**** install runtime packages ****" && \
+  apk add --no-cache \
+    yarn && \
+  if [ -z ${OVERSEERR_VERSION+x} ]; then \
+    OVERSEERR_VERSION=$(curl -sX GET "https://api.github.com/repos/sct/overseerr/releases/latest" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  export COMMIT_TAG="${OVERSEERR_VERSION}" && \
+  curl -o \
+    /tmp/overseerr.tar.gz -L \
+    "https://github.com/sct/overseerr/archive/${OVERSEERR_VERSION}.tar.gz" && \
+  mkdir -p /app/overseerr && \
+  tar xzf \
+    /tmp/overseerr.tar.gz -C \
+    /app/overseerr/ --strip-components=1 && \
+  cd /app/overseerr && \
+  export NODE_OPTIONS=--max_old_space_size=2048 && \
+  yarn --frozen-lockfile --network-timeout 1000000 && \
+  yarn build && \
+  yarn install --production --ignore-scripts --prefer-offline && \
+  yarn cache clean && \
+  echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json && \
+  rm -rf /app/overseerr/config && \
+  ln -s /config /app/overseerr/config && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
     /root/.cache \
     /tmp/*
 
diff --git a/README.md b/README.md
index f3f723e..16c0027 100644
--- a/README.md
+++ b/README.md
@@ -228,4 +228,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.09.21:** - Rebase to alpine 3.14. Update code formatting. Increase js mem limit.
 * **05.04.21:** - Initial Release.
diff --git a/readme-vars.yml b/readme-vars.yml
index d246148..fd209e9 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -47,4 +47,5 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "19.09.21:", desc: "Rebase to alpine 3.14. Update code formatting. Increase js mem limit." }
   - { date: "05.04.21:", desc: "Initial Release." }
diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index 4a5264a..05c4707 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -2,4 +2,4 @@
 
 # permissions
 chown -R abc:abc \
-	/config
+    /config
diff --git a/root/etc/services.d/overseerr/run b/root/etc/services.d/overseerr/run
index bc3d074..eecf5d2 100644
--- a/root/etc/services.d/overseerr/run
+++ b/root/etc/services.d/overseerr/run
@@ -5,4 +5,4 @@ cd /app/overseerr || exit
 export CONFIG_DIRECTORY="/config"
 
 exec \
-	s6-setuidgid abc /usr/bin/yarn start
+    s6-setuidgid abc /usr/bin/yarn start