diff --git a/bitbucket/6.2.0/Dockerfile b/bitbucket/6.2.0/Dockerfile
index 19f0964a2..2385b1817 100644
--- a/bitbucket/6.2.0/Dockerfile
+++ b/bitbucket/6.2.0/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.2.0
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.2.0
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.2.1/Dockerfile b/bitbucket/6.2.1/Dockerfile
index dfcf31070..3dfeebc81 100644
--- a/bitbucket/6.2.1/Dockerfile
+++ b/bitbucket/6.2.1/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.2.1
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.2.1
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.3.0/Dockerfile b/bitbucket/6.3.0/Dockerfile
index d1553283d..9cf5555d3 100644
--- a/bitbucket/6.3.0/Dockerfile
+++ b/bitbucket/6.3.0/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.3.0
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.3.0
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.3.1/Dockerfile b/bitbucket/6.3.1/Dockerfile
index 4a1172507..0f8a5e6a0 100644
--- a/bitbucket/6.3.1/Dockerfile
+++ b/bitbucket/6.3.1/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.3.1
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.3.1
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.3.2/Dockerfile b/bitbucket/6.3.2/Dockerfile
index 58a3c6446..7e5d8b860 100644
--- a/bitbucket/6.3.2/Dockerfile
+++ b/bitbucket/6.3.2/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.3.2
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.3.2
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.4.0/Dockerfile b/bitbucket/6.4.0/Dockerfile
index fab9ff5cb..485bb4df3 100644
--- a/bitbucket/6.4.0/Dockerfile
+++ b/bitbucket/6.4.0/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.4.0
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.4.0
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.4.1/Dockerfile b/bitbucket/6.4.1/Dockerfile
index 788d1f26e..a5f00aa66 100644
--- a/bitbucket/6.4.1/Dockerfile
+++ b/bitbucket/6.4.1/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.4.1
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.4.1
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.5.0/Dockerfile b/bitbucket/6.5.0/Dockerfile
index 9a9a01549..a08d739f6 100644
--- a/bitbucket/6.5.0/Dockerfile
+++ b/bitbucket/6.5.0/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.5.0
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.5.0
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.5.1/Dockerfile b/bitbucket/6.5.1/Dockerfile
index 0287ec9aa..431ecac8f 100644
--- a/bitbucket/6.5.1/Dockerfile
+++ b/bitbucket/6.5.1/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.5.1
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.5.1
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.5.2/Dockerfile b/bitbucket/6.5.2/Dockerfile
index 4f8dd3518..b6de3f791 100644
--- a/bitbucket/6.5.2/Dockerfile
+++ b/bitbucket/6.5.2/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.5.2
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.5.2
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.6.0/Dockerfile b/bitbucket/6.6.0/Dockerfile
index 2846911af..0a67b6735 100644
--- a/bitbucket/6.6.0/Dockerfile
+++ b/bitbucket/6.6.0/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.6.0
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.6.0
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.6.1/Dockerfile b/bitbucket/6.6.1/Dockerfile
index e9ceef2c0..875adfb1a 100644
--- a/bitbucket/6.6.1/Dockerfile
+++ b/bitbucket/6.6.1/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.6.1
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.6.1
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/6.6.2/Dockerfile b/bitbucket/6.6.2/Dockerfile
index fc2ed56bf..5a5afe54e 100644
--- a/bitbucket/6.6.2/Dockerfile
+++ b/bitbucket/6.6.2/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.6.2
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.6.2
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-
diff --git a/bitbucket/latest/Dockerfile b/bitbucket/latest/Dockerfile
index fc2ed56bf..5a5afe54e 100644
--- a/bitbucket/latest/Dockerfile
+++ b/bitbucket/latest/Dockerfile
@@ -1,6 +1,16 @@
-FROM debian:buster
-MAINTAINER Atlassian Bitbucket Server Team
+FROM epicmorg/prod
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#                   ARGuments
+##################################################################
+ARG BITBUCKET_VERSION=6.6.2
+ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
+
+##################################################################
+#                   Setup
+##################################################################
 ENV RUN_USER            daemon
 ENV RUN_GROUP           daemon
 
@@ -8,23 +18,6 @@ ENV RUN_GROUP           daemon
 ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
 ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
 
-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
-# url: missing
-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 git
-
-#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 ["${BITBUCKET_HOME}"]
 WORKDIR $BITBUCKET_HOME
 
@@ -32,28 +25,21 @@ WORKDIR $BITBUCKET_HOME
 EXPOSE 7990
 EXPOSE 7999
 
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                    ${BITBUCKET_INSTALL_DIR} \
+    && curl -L                                  ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
+    && chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}/ \
+    && sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+
+    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
-
-#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 BITBUCKET_VERSION=6.6.2
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
 COPY . /tmp
-
-RUN mkdir -p                             	${BITBUCKET_INSTALL_DIR} \
-    && curl -L --silent                  	${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
-    && chown -R ${RUN_USER}:${RUN_GROUP} 	${BITBUCKET_INSTALL_DIR}/ \
-    && sed -i -e 's/^# umask/umask/' 		${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh
-