diff --git a/confluence/6.13.4/Dockerfile b/confluence/6.13.4/Dockerfile
index 16fc997d6..af9c8b332 100644
--- a/confluence/6.13.4/Dockerfile
+++ b/confluence/6.13.4/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Confluence Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG CONFLUENCE_VERSION=6.13.4
+ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV CONFLUENCE_HOME          /var/atlassian/application-data/confluence
 ENV CONFLUENCE_INSTALL_DIR   /opt/atlassian/confluence
 
-ENV DEBIAN_FRONTEND noninteractive
-
-#editing sources list
-RUN rm /etc/apt/sources.list
-COPY sources.list /etc/apt/sources.list
-COPY locale.gen /etc/locale.gen
-
-#installing utils
-# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx  gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig
-
-#installing java
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02
-RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list
-RUN apt-get update && apt-get install -y --allow-unauthenticated  adoptopenjdk-8-installer
-
 VOLUME ["${CONFLUENCE_HOME}"]
 WORKDIR $CONFLUENCE_HOME
 
@@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME
 EXPOSE 8090
 EXPOSE 8091
 
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-COPY entrypoint.sh              /entrypoint.sh
-
-#After install fixes
-RUN localedef en_US.UTF-8 -i en_US -f UTF-8
-RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
-RUN apt update
-RUN apt upgrade -y
-RUN apt dist-upgrade -y
-RUN apt-get clean autoclean
-RUN apt-get autoremove -y
-RUN rm -rf /var/lib/apt/lists/*
-
-ARG CONFLUENCE_VERSION=6.13.4
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-COPY . /tmp
-
+##################################################################
+#                   Installing
+##################################################################
 RUN mkdir -p                             ${CONFLUENCE_INSTALL_DIR} \
-    && curl -L --silent                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
+    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
     && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \
     && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
-    && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml
+    && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
+
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh              /entrypoint.sh
+COPY . /tmp
diff --git a/confluence/7.0.1/Dockerfile b/confluence/7.0.1/Dockerfile
index b7a428328..1ad4df6f9 100644
--- a/confluence/7.0.1/Dockerfile
+++ b/confluence/7.0.1/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Confluence Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG CONFLUENCE_VERSION=7.0.1
+ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV CONFLUENCE_HOME          /var/atlassian/application-data/confluence
 ENV CONFLUENCE_INSTALL_DIR   /opt/atlassian/confluence
 
-ENV DEBIAN_FRONTEND noninteractive
-
-#editing sources list
-RUN rm /etc/apt/sources.list
-COPY sources.list /etc/apt/sources.list
-COPY locale.gen /etc/locale.gen
-
-#installing utils
-# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx  gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig
-
-#installing java
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02
-RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list
-RUN apt-get update && apt-get install -y --allow-unauthenticated  adoptopenjdk-8-installer
-
 VOLUME ["${CONFLUENCE_HOME}"]
 WORKDIR $CONFLUENCE_HOME
 
@@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME
 EXPOSE 8090
 EXPOSE 8091
 
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-COPY entrypoint.sh              /entrypoint.sh
-
-#After install fixes
-RUN localedef en_US.UTF-8 -i en_US -f UTF-8
-RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
-RUN apt update
-RUN apt upgrade -y
-RUN apt dist-upgrade -y
-RUN apt-get clean autoclean
-RUN apt-get autoremove -y
-RUN rm -rf /var/lib/apt/lists/*
-
-ARG CONFLUENCE_VERSION=7.0.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-COPY . /tmp
-
+##################################################################
+#                   Installing
+##################################################################
 RUN mkdir -p                             ${CONFLUENCE_INSTALL_DIR} \
-    && curl -L --silent                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
+    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
     && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \
     && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
-    && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml
+    && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
+
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh              /entrypoint.sh
+COPY . /tmp
diff --git a/confluence/README.md b/confluence/README.md
index b15267095..63196d6e1 100644
--- a/confluence/README.md
+++ b/confluence/README.md
@@ -4,5 +4,5 @@
 All presented images avalible on our repo in docker hub. But CI builds now only `LTS` and `latest` releases *and `6.9.0` version for our purposes.*
 
 ## LTS releases:
-* Latest version of Confluence `6.13`
-* Latest version of Confluence `6.6`
+* Latest version of Confluence `6.13.4`
+
diff --git a/confluence/latest/Dockerfile b/confluence/latest/Dockerfile
index 6effcf702..d2fa2a124 100644
--- a/confluence/latest/Dockerfile
+++ b/confluence/latest/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Confluence Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG CONFLUENCE_VERSION=6.15.9
+ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV CONFLUENCE_HOME          /var/atlassian/application-data/confluence
 ENV CONFLUENCE_INSTALL_DIR   /opt/atlassian/confluence
 
-ENV DEBIAN_FRONTEND noninteractive
-
-#editing sources list
-RUN rm /etc/apt/sources.list
-COPY sources.list /etc/apt/sources.list
-COPY locale.gen /etc/locale.gen
-
-#installing utils
-# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx  gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig
-
-#installing java
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02
-RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list
-RUN apt-get update && apt-get install -y --allow-unauthenticated  adoptopenjdk-8-installer
-
 VOLUME ["${CONFLUENCE_HOME}"]
 WORKDIR $CONFLUENCE_HOME
 
@@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME
 EXPOSE 8090
 EXPOSE 8091
 
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-COPY entrypoint.sh              /entrypoint.sh
-
-#After install fixes
-RUN localedef en_US.UTF-8 -i en_US -f UTF-8
-RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
-RUN apt update
-RUN apt upgrade -y
-RUN apt dist-upgrade -y
-RUN apt-get clean autoclean
-RUN apt-get autoremove -y
-RUN rm -rf /var/lib/apt/lists/*
-
-ARG CONFLUENCE_VERSION=6.15.9
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-COPY . /tmp
-
+##################################################################
+#                   Installing
+##################################################################
 RUN mkdir -p                             ${CONFLUENCE_INSTALL_DIR} \
-    && curl -L --silent                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
+    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
     && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \
     && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
-    && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml
+    && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
+
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh              /entrypoint.sh
+COPY . /tmp