diff --git a/.travis.yml b/.travis.yml
index fe859382a..a8296e214 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,18 +46,48 @@ matrix:
 ####  Our High priority images
 #########################################
 
+#    - name: Template
+#      script:
+#      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+#      - docker build --compress -t user/repo:tag path/to/folder/contains/dockerfile
+#      - docker push user/repo:tag
+
     - name: Base Production
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/prod:latest epicmorg/prod
+      - docker build --compress -t epicmorg/prod:latest epicmorg/prod/main
       - docker push epicmorg/prod:latest
 
+    - name: Base Production + JDK 8
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/prod:jdk8 epicmorg/prod/jdk8
+      - docker push epicmorg/prod:jdk8
+
+    - name: Base Production + JDK 11
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/prod:jdk11 epicmorg/prod/jdk11
+      - docker push epicmorg/prod:jdk11
+
     - name: Base Develop
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/devel:latest epicmorg/devel
       - docker push epicmorg/devel:latest
 
+    - name: Base Develop + JDK 8
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/devel:jdk8 epicmorg/devel/jdk8
+      - docker push epicmorg/devel:jdk8
+
+    - name: Base Develop + JDK 11
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11
+      - docker push epicmorg/devel:jdk11
+
     - name: TeamCity Agent
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
diff --git a/epicmorg/devel/.docker-repository.yml b/epicmorg/devel/jdk11/.docker-repository.yml
similarity index 100%
rename from epicmorg/devel/.docker-repository.yml
rename to epicmorg/devel/jdk11/.docker-repository.yml
diff --git a/epicmorg/devel/.dockerignore b/epicmorg/devel/jdk11/.dockerignore
similarity index 100%
rename from epicmorg/devel/.dockerignore
rename to epicmorg/devel/jdk11/.dockerignore
diff --git a/epicmorg/devel/jdk11/Dockerfile b/epicmorg/devel/jdk11/Dockerfile
new file mode 100644
index 000000000..e97bdf420
--- /dev/null
+++ b/epicmorg/devel/jdk11/Dockerfile
@@ -0,0 +1,23 @@
+FROM epicmorg/devel
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib
+
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/epicmorg/devel/jdk11/Makefile b/epicmorg/devel/jdk11/Makefile
new file mode 100644
index 000000000..62e0280e0
--- /dev/null
+++ b/epicmorg/devel/jdk11/Makefile
@@ -0,0 +1,5 @@
+all: emgdev
+emgdev:
+	docker build --compress -t epicmorg/devel:jdk11 .
+	docker push epicmorg/devel:jdk11
+
diff --git a/epicmorg/devel/jdk8/.docker-repository.yml b/epicmorg/devel/jdk8/.docker-repository.yml
new file mode 100644
index 000000000..9ab554e4d
--- /dev/null
+++ b/epicmorg/devel/jdk8/.docker-repository.yml
@@ -0,0 +1 @@
+repository: epicmorg/devel
diff --git a/epicmorg/prod-jdk8/.dockerignore b/epicmorg/devel/jdk8/.dockerignore
similarity index 100%
rename from epicmorg/prod-jdk8/.dockerignore
rename to epicmorg/devel/jdk8/.dockerignore
diff --git a/epicmorg/devel/jdk8/Dockerfile b/epicmorg/devel/jdk8/Dockerfile
new file mode 100644
index 000000000..a9cf2ba58
--- /dev/null
+++ b/epicmorg/devel/jdk8/Dockerfile
@@ -0,0 +1,20 @@
+FROM epicmorg/devel
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java8
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot
+
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/epicmorg/devel/jdk8/Makefile b/epicmorg/devel/jdk8/Makefile
new file mode 100644
index 000000000..17f27ca0e
--- /dev/null
+++ b/epicmorg/devel/jdk8/Makefile
@@ -0,0 +1,5 @@
+all: emgdev
+emgdev:
+	docker build --compress -t epicmorg/devel:jdk8 .
+	docker push epicmorg/devel:jdk8
+
diff --git a/epicmorg/devel/main/.docker-repository.yml b/epicmorg/devel/main/.docker-repository.yml
new file mode 100644
index 000000000..9ab554e4d
--- /dev/null
+++ b/epicmorg/devel/main/.docker-repository.yml
@@ -0,0 +1 @@
+repository: epicmorg/devel
diff --git a/epicmorg/prod/.dockerignore b/epicmorg/devel/main/.dockerignore
similarity index 100%
rename from epicmorg/prod/.dockerignore
rename to epicmorg/devel/main/.dockerignore
diff --git a/epicmorg/devel/Dockerfile b/epicmorg/devel/main/Dockerfile
similarity index 100%
rename from epicmorg/devel/Dockerfile
rename to epicmorg/devel/main/Dockerfile
diff --git a/epicmorg/devel/Makefile b/epicmorg/devel/main/Makefile
similarity index 100%
rename from epicmorg/devel/Makefile
rename to epicmorg/devel/main/Makefile
diff --git a/epicmorg/devel/sources.list b/epicmorg/devel/main/sources.list
similarity index 100%
rename from epicmorg/devel/sources.list
rename to epicmorg/devel/main/sources.list
diff --git a/epicmorg/prod/Dockerfile b/epicmorg/prod/Dockerfile
deleted file mode 100644
index a9c4bef17..000000000
--- a/epicmorg/prod/Dockerfile
+++ /dev/null
@@ -1,85 +0,0 @@
-FROM debian:buster
-LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-#                   buster sources list
-##################################################################
-COPY deb-multimedia-keyring.gpg /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg
-RUN rm /etc/apt/sources.list
-COPY sources.list /etc/apt/sources.list
-RUN apt update && apt dist-upgrade -y
-COPY locale.gen /etc/locale.gen
-
-##################################################################
-#                   installing utils
-##################################################################
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
-    apt-get update &&  \
-    apt-get install -y --allow-unauthenticated \
-    apt-transport-https \
-    apt-utils \
-    bash \
-    ca-certificates \
-    cmatrix \
-    cmatrix-xfont \
-    console-cyrillic \
-    curl \
-    ffmpeg \
-    fontconfig \
-    git \
-    gnupg \
-    gnupg2 \
-    graphicsmagick \
-    htop \
-    iftop \
-    iputils-ping \
-    kmod \
-    libzip4 \
-    locales \
-    lsb-release \
-    lsof \
-    lynx \
-    mc \
-    nano \
-    nmap \
-    openssl \
-    perl \
-    procps \
-    rsync \
-    screenfetch \
-    smbclient \
-    sudo \
-    telnet \
-    tini \
-    tmux \
-    tree \
-    ttf-dejavu \
-    util-linux \
-    uuid-runtime \
-    wget \
-    zip
-
-##################################################################
-#                   installing java8
-##################################################################
-#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 && \
-#    echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list && \
-#    apt-get update && \
-#    apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer
-
-RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
-    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
-    apt-get update && \
-    apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
-    mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
-    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
-    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib
-
-##################################################################
-#                   cleaninig up
-##################################################################
-RUN apt clean -y && \
-    apt autoclean -y && \
-    rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/epicmorg/prod/Makefile b/epicmorg/prod/Makefile
deleted file mode 100644
index 9c6cb3e47..000000000
--- a/epicmorg/prod/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/prod .
-	docker push epicmorg/prod
-
diff --git a/epicmorg/prod/deb-multimedia-keyring.gpg b/epicmorg/prod/deb-multimedia-keyring.gpg
deleted file mode 100644
index a4f2b1006..000000000
Binary files a/epicmorg/prod/deb-multimedia-keyring.gpg and /dev/null differ
diff --git a/epicmorg/prod-jdk8/.docker-repository.yml b/epicmorg/prod/jdk11/.docker-repository.yml
similarity index 100%
rename from epicmorg/prod-jdk8/.docker-repository.yml
rename to epicmorg/prod/jdk11/.docker-repository.yml
diff --git a/epicmorg/prod/jdk11/.dockerignore b/epicmorg/prod/jdk11/.dockerignore
new file mode 100644
index 000000000..99176b278
--- /dev/null
+++ b/epicmorg/prod/jdk11/.dockerignore
@@ -0,0 +1,3 @@
+.git
+scripts
+.idea
\ No newline at end of file
diff --git a/epicmorg/prod/jdk11/Dockerfile b/epicmorg/prod/jdk11/Dockerfile
new file mode 100644
index 000000000..4601e9a69
--- /dev/null
+++ b/epicmorg/prod/jdk11/Dockerfile
@@ -0,0 +1,22 @@
+FROM epicmorg/prod
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/epicmorg/prod/jdk11/Makefile b/epicmorg/prod/jdk11/Makefile
new file mode 100644
index 000000000..0e1191be5
--- /dev/null
+++ b/epicmorg/prod/jdk11/Makefile
@@ -0,0 +1,5 @@
+all: emgprod
+emgprod:
+	docker build --compress -t epicmorg/prod:jdk11 .
+	docker push epicmorg/prod:jdk11
+
diff --git a/epicmorg/prod/.docker-repository.yml b/epicmorg/prod/jdk8/.docker-repository.yml
similarity index 100%
rename from epicmorg/prod/.docker-repository.yml
rename to epicmorg/prod/jdk8/.docker-repository.yml
diff --git a/epicmorg/prod/jdk8/.dockerignore b/epicmorg/prod/jdk8/.dockerignore
new file mode 100644
index 000000000..99176b278
--- /dev/null
+++ b/epicmorg/prod/jdk8/.dockerignore
@@ -0,0 +1,3 @@
+.git
+scripts
+.idea
\ No newline at end of file
diff --git a/epicmorg/prod/jdk8/Dockerfile b/epicmorg/prod/jdk8/Dockerfile
new file mode 100644
index 000000000..4d5d8c7b4
--- /dev/null
+++ b/epicmorg/prod/jdk8/Dockerfile
@@ -0,0 +1,19 @@
+FROM epicmorg/prod
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java8
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/epicmorg/prod/jdk8/Makefile b/epicmorg/prod/jdk8/Makefile
new file mode 100644
index 000000000..7ee8c155f
--- /dev/null
+++ b/epicmorg/prod/jdk8/Makefile
@@ -0,0 +1,5 @@
+all: emgprod
+emgprod:
+	docker build --compress -t epicmorg/prod:jdk8 .
+	docker push epicmorg/prod:jdk8
+
diff --git a/epicmorg/prod/locale.gen b/epicmorg/prod/locale.gen
deleted file mode 100644
index 02f100afa..000000000
--- a/epicmorg/prod/locale.gen
+++ /dev/null
@@ -1,12 +0,0 @@
-en_GB.UTF-8 UTF-8
-en_GB ISO-8859-1
-en_GB.ISO-8859-15 ISO-8859-15
-en_US.UTF-8 UTF-8
-en_US ISO-8859-1
-en_US.ISO-8859-15 ISO-8859-15
-ru_RU.UTF-8 UTF-8
-ru_RU.KOI8-R KOI8-R
-ru_RU ISO-8859-5
-ru_RU.CP1251 CP1251
-ru_UA.UTF-8 UTF-8
-ru_UA KOI8-U
diff --git a/epicmorg/prod/locale.gen.full b/epicmorg/prod/locale.gen.full
deleted file mode 100644
index 602141659..000000000
--- a/epicmorg/prod/locale.gen.full
+++ /dev/null
@@ -1,496 +0,0 @@
-aa_DJ.UTF-8 UTF-8
-aa_DJ ISO-8859-1
-aa_ER UTF-8
-aa_ER@saaho UTF-8
-aa_ET UTF-8
-af_ZA.UTF-8 UTF-8
-af_ZA ISO-8859-1
-agr_PE UTF-8
-ak_GH UTF-8
-am_ET UTF-8
-an_ES.UTF-8 UTF-8
-an_ES ISO-8859-15
-anp_IN UTF-8
-ar_AE.UTF-8 UTF-8
-ar_AE ISO-8859-6
-ar_BH.UTF-8 UTF-8
-ar_BH ISO-8859-6
-ar_DZ.UTF-8 UTF-8
-ar_DZ ISO-8859-6
-ar_EG.UTF-8 UTF-8
-ar_EG ISO-8859-6
-ar_IN UTF-8
-ar_IQ.UTF-8 UTF-8
-ar_IQ ISO-8859-6
-ar_JO.UTF-8 UTF-8
-ar_JO ISO-8859-6
-ar_KW.UTF-8 UTF-8
-ar_KW ISO-8859-6
-ar_LB.UTF-8 UTF-8
-ar_LB ISO-8859-6
-ar_LY.UTF-8 UTF-8
-ar_LY ISO-8859-6
-ar_MA.UTF-8 UTF-8
-ar_MA ISO-8859-6
-ar_OM.UTF-8 UTF-8
-ar_OM ISO-8859-6
-ar_QA.UTF-8 UTF-8
-ar_QA ISO-8859-6
-ar_SA.UTF-8 UTF-8
-ar_SA ISO-8859-6
-ar_SD.UTF-8 UTF-8
-ar_SD ISO-8859-6
-ar_SS UTF-8
-ar_SY.UTF-8 UTF-8
-ar_SY ISO-8859-6
-ar_TN.UTF-8 UTF-8
-ar_TN ISO-8859-6
-ar_YE.UTF-8 UTF-8
-ar_YE ISO-8859-6
-ayc_PE UTF-8
-az_AZ UTF-8
-az_IR UTF-8
-as_IN UTF-8
-ast_ES.UTF-8 UTF-8
-ast_ES ISO-8859-15
-be_BY.UTF-8 UTF-8
-be_BY CP1251
-be_BY@latin UTF-8
-bem_ZM UTF-8
-ber_DZ UTF-8
-ber_MA UTF-8
-bg_BG.UTF-8 UTF-8
-bg_BG CP1251
-bhb_IN.UTF-8 UTF-8
-bho_IN UTF-8
-bho_NP UTF-8
-bi_VU UTF-8
-bn_BD UTF-8
-bn_IN UTF-8
-bo_CN UTF-8
-bo_IN UTF-8
-br_FR.UTF-8 UTF-8
-br_FR ISO-8859-1
-br_FR@euro ISO-8859-15
-brx_IN UTF-8
-bs_BA.UTF-8 UTF-8
-bs_BA ISO-8859-2
-byn_ER UTF-8
-ca_AD.UTF-8 UTF-8
-ca_AD ISO-8859-15
-ca_ES.UTF-8 UTF-8
-ca_ES ISO-8859-1
-ca_ES@euro ISO-8859-15
-ca_ES@valencia UTF-8
-ca_FR.UTF-8 UTF-8
-ca_FR ISO-8859-15
-ca_IT.UTF-8 UTF-8
-ca_IT ISO-8859-15
-ce_RU UTF-8
-chr_US UTF-8
-cmn_TW UTF-8
-crh_UA UTF-8
-cs_CZ.UTF-8 UTF-8
-cs_CZ ISO-8859-2
-csb_PL UTF-8
-cv_RU UTF-8
-cy_GB.UTF-8 UTF-8
-cy_GB ISO-8859-14
-da_DK.UTF-8 UTF-8
-da_DK ISO-8859-1
-de_AT.UTF-8 UTF-8
-de_AT ISO-8859-1
-de_AT@euro ISO-8859-15
-de_BE.UTF-8 UTF-8
-de_BE ISO-8859-1
-de_BE@euro ISO-8859-15
-de_CH.UTF-8 UTF-8
-de_CH ISO-8859-1
-de_DE.UTF-8 UTF-8
-de_DE ISO-8859-1
-de_DE@euro ISO-8859-15
-de_IT.UTF-8 UTF-8
-de_IT ISO-8859-1
-de_LI.UTF-8 UTF-8
-de_LU.UTF-8 UTF-8
-de_LU ISO-8859-1
-de_LU@euro ISO-8859-15
-doi_IN UTF-8
-dsb_DE UTF-8
-dv_MV UTF-8
-dz_BT UTF-8
-el_GR.UTF-8 UTF-8
-el_GR ISO-8859-7
-el_GR@euro ISO-8859-7
-el_CY.UTF-8 UTF-8
-el_CY ISO-8859-7
-en_AG UTF-8
-en_AU.UTF-8 UTF-8
-en_AU ISO-8859-1
-en_BW.UTF-8 UTF-8
-en_BW ISO-8859-1
-en_CA.UTF-8 UTF-8
-en_CA ISO-8859-1
-en_DK.UTF-8 UTF-8
-en_DK.ISO-8859-15 ISO-8859-15
-en_DK ISO-8859-1
-en_GB.UTF-8 UTF-8
-en_GB ISO-8859-1
-en_GB.ISO-8859-15 ISO-8859-15
-en_HK.UTF-8 UTF-8
-en_HK ISO-8859-1
-en_IE.UTF-8 UTF-8
-en_IE ISO-8859-1
-en_IE@euro ISO-8859-15
-en_IL UTF-8
-en_IN UTF-8
-en_NG UTF-8
-en_NZ.UTF-8 UTF-8
-en_NZ ISO-8859-1
-en_PH.UTF-8 UTF-8
-en_PH ISO-8859-1
-en_SC.UTF-8 UTF-8
-en_SG.UTF-8 UTF-8
-en_SG ISO-8859-1
-en_US.UTF-8 UTF-8
-en_US ISO-8859-1
-en_US.ISO-8859-15 ISO-8859-15
-en_ZA.UTF-8 UTF-8
-en_ZA ISO-8859-1
-en_ZM UTF-8
-en_ZW.UTF-8 UTF-8
-en_ZW ISO-8859-1
-eo UTF-8
-es_AR.UTF-8 UTF-8
-es_AR ISO-8859-1
-es_BO.UTF-8 UTF-8
-es_BO ISO-8859-1
-es_CL.UTF-8 UTF-8
-es_CL ISO-8859-1
-es_CO.UTF-8 UTF-8
-es_CO ISO-8859-1
-es_CR.UTF-8 UTF-8
-es_CR ISO-8859-1
-es_CU UTF-8
-es_DO.UTF-8 UTF-8
-es_DO ISO-8859-1
-es_EC.UTF-8 UTF-8
-es_EC ISO-8859-1
-es_ES.UTF-8 UTF-8
-es_ES ISO-8859-1
-es_ES@euro ISO-8859-15
-es_GT.UTF-8 UTF-8
-es_GT ISO-8859-1
-es_HN.UTF-8 UTF-8
-es_HN ISO-8859-1
-es_MX.UTF-8 UTF-8
-es_MX ISO-8859-1
-es_NI.UTF-8 UTF-8
-es_NI ISO-8859-1
-es_PA.UTF-8 UTF-8
-es_PA ISO-8859-1
-es_PE.UTF-8 UTF-8
-es_PE ISO-8859-1
-es_PR.UTF-8 UTF-8
-es_PR ISO-8859-1
-es_PY.UTF-8 UTF-8
-es_PY ISO-8859-1
-es_SV.UTF-8 UTF-8
-es_SV ISO-8859-1
-es_US.UTF-8 UTF-8
-es_US ISO-8859-1
-es_UY.UTF-8 UTF-8
-es_UY ISO-8859-1
-es_VE.UTF-8 UTF-8
-es_VE ISO-8859-1
-et_EE.UTF-8 UTF-8
-et_EE ISO-8859-1
-et_EE.ISO-8859-15 ISO-8859-15
-eu_ES.UTF-8 UTF-8
-eu_ES ISO-8859-1
-eu_ES@euro ISO-8859-15
-eu_FR.UTF-8 UTF-8
-eu_FR ISO-8859-1
-eu_FR@euro ISO-8859-15
-fa_IR UTF-8
-ff_SN UTF-8
-fi_FI.UTF-8 UTF-8
-fi_FI ISO-8859-1
-fi_FI@euro ISO-8859-15
-fil_PH UTF-8
-fo_FO.UTF-8 UTF-8
-fo_FO ISO-8859-1
-fr_BE.UTF-8 UTF-8
-fr_BE ISO-8859-1
-fr_BE@euro ISO-8859-15
-fr_CA.UTF-8 UTF-8
-fr_CA ISO-8859-1
-fr_CH.UTF-8 UTF-8
-fr_CH ISO-8859-1
-fr_FR.UTF-8 UTF-8
-fr_FR ISO-8859-1
-fr_FR@euro ISO-8859-15
-fr_LU.UTF-8 UTF-8
-fr_LU ISO-8859-1
-fr_LU@euro ISO-8859-15
-fur_IT UTF-8
-fy_NL UTF-8
-fy_DE UTF-8
-ga_IE.UTF-8 UTF-8
-ga_IE ISO-8859-1
-ga_IE@euro ISO-8859-15
-gd_GB.UTF-8 UTF-8
-gd_GB ISO-8859-15
-gez_ER UTF-8
-gez_ER@abegede UTF-8
-gez_ET UTF-8
-gez_ET@abegede UTF-8
-gl_ES.UTF-8 UTF-8
-gl_ES ISO-8859-1
-gl_ES@euro ISO-8859-15
-gu_IN UTF-8
-gv_GB.UTF-8 UTF-8
-gv_GB ISO-8859-1
-ha_NG UTF-8
-hak_TW UTF-8
-he_IL.UTF-8 UTF-8
-he_IL ISO-8859-8
-hi_IN UTF-8
-hif_FJ UTF-8
-hne_IN UTF-8
-hr_HR.UTF-8 UTF-8
-hr_HR ISO-8859-2
-hsb_DE.UTF-8 UTF-8
-hsb_DE ISO-8859-2
-ht_HT UTF-8
-hu_HU.UTF-8 UTF-8
-hu_HU ISO-8859-2
-hy_AM UTF-8
-hy_AM.ARMSCII-8 ARMSCII-8
-ia_FR UTF-8
-id_ID.UTF-8 UTF-8
-id_ID ISO-8859-1
-ig_NG UTF-8
-ik_CA UTF-8
-is_IS.UTF-8 UTF-8
-is_IS ISO-8859-1
-it_CH.UTF-8 UTF-8
-it_CH ISO-8859-1
-it_IT.UTF-8 UTF-8
-it_IT ISO-8859-1
-it_IT@euro ISO-8859-15
-iu_CA UTF-8
-ja_JP.UTF-8 UTF-8
-ja_JP.EUC-JP EUC-JP
-ka_GE.UTF-8 UTF-8
-ka_GE GEORGIAN-PS
-kab_DZ UTF-8
-kk_KZ.UTF-8 UTF-8
-kk_KZ PT154
-kk_KZ.RK1048 RK1048
-kl_GL.UTF-8 UTF-8
-kl_GL ISO-8859-1
-km_KH UTF-8
-kn_IN UTF-8
-ko_KR.UTF-8 UTF-8
-ko_KR.EUC-KR EUC-KR
-kok_IN UTF-8
-ks_IN UTF-8
-ks_IN@devanagari UTF-8
-ku_TR.UTF-8 UTF-8
-ku_TR ISO-8859-9
-kw_GB.UTF-8 UTF-8
-kw_GB ISO-8859-1
-ky_KG UTF-8
-lb_LU UTF-8
-lg_UG.UTF-8 UTF-8
-lg_UG ISO-8859-10
-li_BE UTF-8
-li_NL UTF-8
-lij_IT UTF-8
-ln_CD UTF-8
-lo_LA UTF-8
-lt_LT.UTF-8 UTF-8
-lt_LT ISO-8859-13
-lv_LV.UTF-8 UTF-8
-lv_LV ISO-8859-13
-lzh_TW UTF-8
-mag_IN UTF-8
-mai_IN UTF-8
-mai_NP UTF-8
-mfe_MU UTF-8
-mg_MG.UTF-8 UTF-8
-mg_MG ISO-8859-15
-mhr_RU UTF-8
-mi_NZ.UTF-8 UTF-8
-mi_NZ ISO-8859-13
-miq_NI UTF-8
-mjw_IN UTF-8
-mk_MK.UTF-8 UTF-8
-mk_MK ISO-8859-5
-ml_IN UTF-8
-mn_MN UTF-8
-mni_IN UTF-8
-mr_IN UTF-8
-ms_MY.UTF-8 UTF-8
-ms_MY ISO-8859-1
-mt_MT.UTF-8 UTF-8
-mt_MT ISO-8859-3
-my_MM UTF-8
-nan_TW UTF-8
-nan_TW@latin UTF-8
-nb_NO.UTF-8 UTF-8
-nb_NO ISO-8859-1
-nds_DE UTF-8
-nds_NL UTF-8
-ne_NP UTF-8
-nhn_MX UTF-8
-niu_NU UTF-8
-niu_NZ UTF-8
-nl_AW UTF-8
-nl_BE.UTF-8 UTF-8
-nl_BE ISO-8859-1
-nl_BE@euro ISO-8859-15
-nl_NL.UTF-8 UTF-8
-nl_NL ISO-8859-1
-nl_NL@euro ISO-8859-15
-nn_NO.UTF-8 UTF-8
-nn_NO ISO-8859-1
-nr_ZA UTF-8
-nso_ZA UTF-8
-oc_FR.UTF-8 UTF-8
-oc_FR ISO-8859-1
-om_ET UTF-8
-om_KE.UTF-8 UTF-8
-om_KE ISO-8859-1
-or_IN UTF-8
-os_RU UTF-8
-pa_IN UTF-8
-pa_PK UTF-8
-pap_AW UTF-8
-pap_CW UTF-8
-pl_PL.UTF-8 UTF-8
-pl_PL ISO-8859-2
-ps_AF UTF-8
-pt_BR.UTF-8 UTF-8
-pt_BR ISO-8859-1
-pt_PT.UTF-8 UTF-8
-pt_PT ISO-8859-1
-pt_PT@euro ISO-8859-15
-quz_PE UTF-8
-raj_IN UTF-8
-ro_RO.UTF-8 UTF-8
-ro_RO ISO-8859-2
-ru_RU.UTF-8 UTF-8
-ru_RU.KOI8-R KOI8-R
-ru_RU ISO-8859-5
-ru_RU.CP1251 CP1251
-ru_UA.UTF-8 UTF-8
-ru_UA KOI8-U
-rw_RW UTF-8
-sa_IN UTF-8
-sah_RU UTF-8
-sat_IN UTF-8
-sc_IT UTF-8
-sd_IN UTF-8
-sd_IN@devanagari UTF-8
-se_NO UTF-8
-sgs_LT UTF-8
-shn_MM UTF-8
-shs_CA UTF-8
-si_LK UTF-8
-sid_ET UTF-8
-sk_SK.UTF-8 UTF-8
-sk_SK ISO-8859-2
-sl_SI.UTF-8 UTF-8
-sl_SI ISO-8859-2
-sm_WS UTF-8
-so_DJ.UTF-8 UTF-8
-so_DJ ISO-8859-1
-so_ET UTF-8
-so_KE.UTF-8 UTF-8
-so_KE ISO-8859-1
-so_SO.UTF-8 UTF-8
-so_SO ISO-8859-1
-sq_AL.UTF-8 UTF-8
-sq_AL ISO-8859-1
-sq_MK UTF-8
-sr_ME UTF-8
-sr_RS UTF-8
-sr_RS@latin UTF-8
-ss_ZA UTF-8
-st_ZA.UTF-8 UTF-8
-st_ZA ISO-8859-1
-sv_FI.UTF-8 UTF-8
-sv_FI ISO-8859-1
-sv_FI@euro ISO-8859-15
-sv_SE.UTF-8 UTF-8
-sv_SE ISO-8859-1
-sv_SE.ISO-8859-15 ISO-8859-15
-sw_KE UTF-8
-sw_TZ UTF-8
-szl_PL UTF-8
-ta_IN UTF-8
-ta_LK UTF-8
-tcy_IN.UTF-8 UTF-8
-te_IN UTF-8
-tg_TJ.UTF-8 UTF-8
-tg_TJ KOI8-T
-th_TH.UTF-8 UTF-8
-th_TH TIS-620
-the_NP UTF-8
-ti_ER UTF-8
-ti_ET UTF-8
-tig_ER UTF-8
-tk_TM UTF-8
-tl_PH.UTF-8 UTF-8
-tl_PH ISO-8859-1
-tn_ZA UTF-8
-to_TO UTF-8
-tpi_PG UTF-8
-tr_CY.UTF-8 UTF-8
-tr_CY ISO-8859-9
-tr_TR.UTF-8 UTF-8
-tr_TR ISO-8859-9
-ts_ZA UTF-8
-tt_RU UTF-8
-tt_RU@iqtelif UTF-8
-ug_CN UTF-8
-uk_UA.UTF-8 UTF-8
-uk_UA KOI8-U
-unm_US UTF-8
-ur_IN UTF-8
-ur_PK UTF-8
-uz_UZ.UTF-8 UTF-8
-uz_UZ ISO-8859-1
-uz_UZ@cyrillic UTF-8
-ve_ZA UTF-8
-vi_VN UTF-8
-wa_BE.UTF-8 UTF-8
-wa_BE ISO-8859-1
-wa_BE@euro ISO-8859-15
-wae_CH UTF-8
-wal_ET UTF-8
-wo_SN UTF-8
-xh_ZA.UTF-8 UTF-8
-xh_ZA ISO-8859-1
-yi_US.UTF-8 UTF-8
-yi_US CP1255
-yo_NG UTF-8
-yue_HK UTF-8
-yuw_PG UTF-8
-zh_CN.UTF-8 UTF-8
-zh_CN.GB18030 GB18030
-zh_CN.GBK GBK
-zh_CN GB2312
-zh_HK.UTF-8 UTF-8
-zh_HK BIG5-HKSCS
-zh_SG.UTF-8 UTF-8
-zh_SG.GBK GBK
-zh_SG GB2312
-zh_TW.UTF-8 UTF-8
-zh_TW.EUC-TW EUC-TW
-zh_TW BIG5
-zu_ZA.UTF-8 UTF-8
-zu_ZA ISO-8859-1
-
diff --git a/epicmorg/prod/main/.docker-repository.yml b/epicmorg/prod/main/.docker-repository.yml
new file mode 100644
index 000000000..1e50bcd0a
--- /dev/null
+++ b/epicmorg/prod/main/.docker-repository.yml
@@ -0,0 +1 @@
+repository: epicmorg/prod
diff --git a/epicmorg/prod/main/.dockerignore b/epicmorg/prod/main/.dockerignore
new file mode 100644
index 000000000..99176b278
--- /dev/null
+++ b/epicmorg/prod/main/.dockerignore
@@ -0,0 +1,3 @@
+.git
+scripts
+.idea
\ No newline at end of file
diff --git a/epicmorg/prod-jdk8/Dockerfile b/epicmorg/prod/main/Dockerfile
similarity index 61%
rename from epicmorg/prod-jdk8/Dockerfile
rename to epicmorg/prod/main/Dockerfile
index a9c4bef17..e472cfb5e 100644
--- a/epicmorg/prod-jdk8/Dockerfile
+++ b/epicmorg/prod/main/Dockerfile
@@ -60,22 +60,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     wget \
     zip
 
-##################################################################
-#                   installing java8
-##################################################################
-#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 && \
-#    echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list && \
-#    apt-get update && \
-#    apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer
-
-RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
-    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
-    apt-get update && \
-    apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
-    mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
-    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
-    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib
-
 ##################################################################
 #                   cleaninig up
 ##################################################################
diff --git a/epicmorg/prod-jdk8/Makefile b/epicmorg/prod/main/Makefile
similarity index 100%
rename from epicmorg/prod-jdk8/Makefile
rename to epicmorg/prod/main/Makefile
diff --git a/epicmorg/prod-jdk8/deb-multimedia-keyring.gpg b/epicmorg/prod/main/deb-multimedia-keyring.gpg
similarity index 100%
rename from epicmorg/prod-jdk8/deb-multimedia-keyring.gpg
rename to epicmorg/prod/main/deb-multimedia-keyring.gpg
diff --git a/epicmorg/prod-jdk8/locale.gen b/epicmorg/prod/main/locale.gen
similarity index 100%
rename from epicmorg/prod-jdk8/locale.gen
rename to epicmorg/prod/main/locale.gen
diff --git a/epicmorg/prod-jdk8/locale.gen.full b/epicmorg/prod/main/locale.gen.full
similarity index 100%
rename from epicmorg/prod-jdk8/locale.gen.full
rename to epicmorg/prod/main/locale.gen.full
diff --git a/epicmorg/prod-jdk8/sources.list b/epicmorg/prod/main/sources.list
similarity index 100%
rename from epicmorg/prod-jdk8/sources.list
rename to epicmorg/prod/main/sources.list
diff --git a/epicmorg/prod/sources.list b/epicmorg/prod/sources.list
deleted file mode 100644
index e8180240e..000000000
--- a/epicmorg/prod/sources.list
+++ /dev/null
@@ -1,17 +0,0 @@
-#main
-deb http://ftp.ru.debian.org/debian/ buster main contrib non-free
-deb-src http://ftp.ru.debian.org/debian/ buster main contrib non-free
-deb http://ftp.ru.debian.org/debian/ buster-updates main contrib non-free
-deb-src http://ftp.ru.debian.org/debian/ buster-updates main contrib non-free
-deb http://ftp.ru.debian.org/debian/ buster-proposed-updates main contrib non-free
-deb-src http://ftp.ru.debian.org/debian/ buster-proposed-updates main contrib non-free
- 
-#security
-deb http://ftp.ru.debian.org/debian-security/ buster/updates main contrib non-free
-deb-src http://ftp.ru.debian.org/debian-security/ buster/updates main contrib non-free
- 
-##multimedia
-#deb http://ftp.ru.debian.org/debian-multimedia/ buster main non-free
-#deb-src http://ftp.ru.debian.org/debian-multimedia/ buster main non-free
-#deb http://ftp.ru.debian.org/debian-multimedia/ buster-backports main
-#deb-src http://ftp.ru.debian.org/debian-multimedia/ buster-backports main
diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile
index cc20494f6..ac578d7fb 100644
--- a/teamcity-agent/Dockerfile
+++ b/teamcity-agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/devel
+FROM epicmorg/devel:jdk11
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive