diff --git a/.travis.yml b/.travis.yml
index 48fff8d6c..075c10544 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,6 +66,20 @@ matrix:
       - docker build --compress -t epicmorg/prod:jdk11 epicmorg/prod/jdk11
       - docker push epicmorg/prod:jdk11
 
+##########
+
+    - name: Edge + JDK 8 + JDK 11
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/edge:latest epicmorg/edge/main
+      - docker push epicmorg/edge:latest
+ 
+      - docker build --compress -t epicmorg/edge:jdk8 epicmorg/edge/jdk8
+      - docker push epicmorg/edge:jdk8
+ 
+      - docker build --compress -t epicmorg/edge:jdk11 epicmorg/edge/jdk11
+      - docker push epicmorg/edge:jdk11
+
 ##########
 
     - name: Base Develop  + JDK 8 + JDK 11
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bb955ffa..d0ae22007 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,10 @@
  		* added to `TeamCity Agent` `atlassian adk` support
 		* updated docker binary
 		* moved back `valve` and `steam-runtime` in to image from `devel`
+	* added `edge` image. 
+		* switched `qbittorrent` images to `edge`
+		* switched final `balancer` image to `edge`
+	* reduced containers size by switching to `debian-slim` base-image.
 * 12/13/2019
     * updated `teamcity agent`. added `php 7.3` support.
     * fixed `nginx` image.
diff --git a/atlassian/bitbucket/latest/Dockerfile b/atlassian/bitbucket/latest/Dockerfile
index e4dd232d7..3cec384db 100644
--- a/atlassian/bitbucket/latest/Dockerfile
+++ b/atlassian/bitbucket/latest/Dockerfile
@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
diff --git a/atlassian/bitbucket/latest/Dockerfile.jdk11 b/atlassian/bitbucket/latest/Dockerfile.jdk11
index 053caa0ff..84e4351c7 100644
--- a/atlassian/bitbucket/latest/Dockerfile.jdk11
+++ b/atlassian/bitbucket/latest/Dockerfile.jdk11
@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
diff --git a/atlassian/confluence/latest/Dockerfile b/atlassian/confluence/latest/Dockerfile
index 107b68b3b..e5c69c4e4 100644
--- a/atlassian/confluence/latest/Dockerfile
+++ b/atlassian/confluence/latest/Dockerfile
@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
diff --git a/atlassian/confluence/latest/Dockerfile.jdk11 b/atlassian/confluence/latest/Dockerfile.jdk11
index 3aee00b73..d6e1745c8 100644
--- a/atlassian/confluence/latest/Dockerfile.jdk11
+++ b/atlassian/confluence/latest/Dockerfile.jdk11
@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
diff --git a/atlassian/jira/latest/Dockerfile b/atlassian/jira/latest/Dockerfile
index 947578d9a..2aa25629b 100644
--- a/atlassian/jira/latest/Dockerfile
+++ b/atlassian/jira/latest/Dockerfile
@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
diff --git a/atlassian/jira/latest/Dockerfile.jdk11 b/atlassian/jira/latest/Dockerfile.jdk11
index 6902e4045..13b0d8d58 100644
--- a/atlassian/jira/latest/Dockerfile.jdk11
+++ b/atlassian/jira/latest/Dockerfile.jdk11
@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
diff --git a/balancer/latest/Dockerfile b/balancer/latest/Dockerfile
index 75f7b2af9..375cd2802 100644
--- a/balancer/latest/Dockerfile
+++ b/balancer/latest/Dockerfile
@@ -2,6 +2,22 @@ FROM epicmorg/devel AS builder
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
@@ -11,7 +27,7 @@ ARG SRC_DIR=${BUILDS_DIR}/src
 ARG EXPORT_DIR=${BUILDS_DIR}/export
 ARG PRE_DIR=${BUILDS_DIR}/pre
 ARG NGINX_SRC_DIR=${SRC_DIR}/nginx
-ARG NGINX_VERSION=1.17.6
+ARG NGINX_VERSION=1.17.8
 ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
 ARG LUAJIT_INC=/usr/local/include/luajit-2.1
 ARG LUAJIT_LIB=/usr/local/lib
@@ -155,10 +171,26 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/devel
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   Installing nginx from deb
 ##################################################################
diff --git a/balancer/php/Dockerfile b/balancer/php/Dockerfile
index d581153d5..e51c1c1ed 100644
--- a/balancer/php/Dockerfile
+++ b/balancer/php/Dockerfile
@@ -2,6 +2,22 @@ FROM epicmorg/balancer:latest
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   Installing php fpn for nginx from deb
 ##################################################################
diff --git a/epicmorg/README.md b/epicmorg/README.md
new file mode 100644
index 000000000..3d25e59b6
--- /dev/null
+++ b/epicmorg/README.md
@@ -0,0 +1,5 @@
+# Difference between images
+
+* `base` - main image based from debian `buster-slim` with enhanced `sources.list`.
+* `edge` - more recent system image. based on `base` image with switched to `sid` (`sid-slim`) update-channel.
+* `devel` - just enhanced `edge` image with preinstalled some pre requirements.
\ No newline at end of file
diff --git a/epicmorg/devel/jdk11/Dockerfile b/epicmorg/devel/jdk11/Dockerfile
index e97bdf420..ba82941ea 100644
--- a/epicmorg/devel/jdk11/Dockerfile
+++ b/epicmorg/devel/jdk11/Dockerfile
@@ -2,12 +2,29 @@ FROM epicmorg/devel
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   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 autoremove -y && \
     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 && \
diff --git a/epicmorg/devel/jdk8/Dockerfile b/epicmorg/devel/jdk8/Dockerfile
index a9cf2ba58..bda777f92 100644
--- a/epicmorg/devel/jdk8/Dockerfile
+++ b/epicmorg/devel/jdk8/Dockerfile
@@ -2,12 +2,29 @@ FROM epicmorg/devel
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   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 autoremove -y && \
     apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot
 
 
diff --git a/epicmorg/devel/main/Dockerfile b/epicmorg/devel/main/Dockerfile
index 12289edab..bda43a142 100644
--- a/epicmorg/devel/main/Dockerfile
+++ b/epicmorg/devel/main/Dockerfile
@@ -1,7 +1,23 @@
-FROM epicmorg/prod
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
@@ -18,9 +34,9 @@ RUN mkdir -p ${SRC_DIR} ${EXPORT_DIR} ${PRE_DIR}
 ##################################################################
 #                   sid sources list
 ##################################################################
-RUN rm /etc/apt/sources.list
-COPY sources.list /etc/apt/sources.list
-RUN apt autoremove -y && apt update && apt dist-upgrade -y
+RUN apt update && \
+    apt-get autoremove -y && \
+    apt dist-upgrade -y
 
 ##################################################################
 #                   deps
@@ -81,7 +97,7 @@ RUN apt-get update && \
     libvpx-dev \
     libvpx6 \
     tcl
- 
+
 ##################################################################
 #                   IP2Location support for prod nginx module
 ##################################################################
diff --git a/epicmorg/edge/jdk11/.docker-repository.yml b/epicmorg/edge/jdk11/.docker-repository.yml
new file mode 100644
index 000000000..7d6511aa9
--- /dev/null
+++ b/epicmorg/edge/jdk11/.docker-repository.yml
@@ -0,0 +1 @@
+repository: epicmorg/edge
diff --git a/epicmorg/edge/jdk11/.dockerignore b/epicmorg/edge/jdk11/.dockerignore
new file mode 100644
index 000000000..99176b278
--- /dev/null
+++ b/epicmorg/edge/jdk11/.dockerignore
@@ -0,0 +1,3 @@
+.git
+scripts
+.idea
\ No newline at end of file
diff --git a/epicmorg/edge/jdk11/Dockerfile b/epicmorg/edge/jdk11/Dockerfile
new file mode 100644
index 000000000..62c0cf889
--- /dev/null
+++ b/epicmorg/edge/jdk11/Dockerfile
@@ -0,0 +1,40 @@
+FROM epicmorg/edge
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
+##################################################################
+#                   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 autoremove -y && \
+    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/edge/jdk11/Makefile b/epicmorg/edge/jdk11/Makefile
new file mode 100644
index 000000000..1bcad05b2
--- /dev/null
+++ b/epicmorg/edge/jdk11/Makefile
@@ -0,0 +1,5 @@
+all: emgdev
+emgdev:
+	docker build --compress -t epicmorg/edge:jdk11 .
+	docker push epicmorg/edge:jdk11
+
diff --git a/epicmorg/edge/jdk8/.docker-repository.yml b/epicmorg/edge/jdk8/.docker-repository.yml
new file mode 100644
index 000000000..7d6511aa9
--- /dev/null
+++ b/epicmorg/edge/jdk8/.docker-repository.yml
@@ -0,0 +1 @@
+repository: epicmorg/edge
diff --git a/epicmorg/edge/jdk8/.dockerignore b/epicmorg/edge/jdk8/.dockerignore
new file mode 100644
index 000000000..99176b278
--- /dev/null
+++ b/epicmorg/edge/jdk8/.dockerignore
@@ -0,0 +1,3 @@
+.git
+scripts
+.idea
\ No newline at end of file
diff --git a/epicmorg/edge/jdk8/Dockerfile b/epicmorg/edge/jdk8/Dockerfile
new file mode 100644
index 000000000..5672315af
--- /dev/null
+++ b/epicmorg/edge/jdk8/Dockerfile
@@ -0,0 +1,37 @@
+FROM epicmorg/edge
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
+##################################################################
+#                   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 autoremove -y && \
+    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/edge/jdk8/Makefile b/epicmorg/edge/jdk8/Makefile
new file mode 100644
index 000000000..6a17f6dc8
--- /dev/null
+++ b/epicmorg/edge/jdk8/Makefile
@@ -0,0 +1,5 @@
+all: emgdev
+emgdev:
+	docker build --compress -t epicmorg/edge:jdk8 .
+	docker push epicmorg/edge:jdk8
+
diff --git a/epicmorg/edge/main/.docker-repository.yml b/epicmorg/edge/main/.docker-repository.yml
new file mode 100644
index 000000000..7d6511aa9
--- /dev/null
+++ b/epicmorg/edge/main/.docker-repository.yml
@@ -0,0 +1 @@
+repository: epicmorg/edge
diff --git a/epicmorg/edge/main/.dockerignore b/epicmorg/edge/main/.dockerignore
new file mode 100644
index 000000000..99176b278
--- /dev/null
+++ b/epicmorg/edge/main/.dockerignore
@@ -0,0 +1,3 @@
+.git
+scripts
+.idea
\ No newline at end of file
diff --git a/epicmorg/edge/main/Dockerfile b/epicmorg/edge/main/Dockerfile
new file mode 100644
index 000000000..669c7e77f
--- /dev/null
+++ b/epicmorg/edge/main/Dockerfile
@@ -0,0 +1,37 @@
+FROM epicmorg/prod
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
+##################################################################
+#                   sid sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+RUN  apt update && \
+     apt autoremove -y && \
+     apt dist-upgrade -y && \
+     apt autoremove -y
+
+##################################################################
+#                   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/edge/main/Makefile b/epicmorg/edge/main/Makefile
new file mode 100644
index 000000000..c44f1d984
--- /dev/null
+++ b/epicmorg/edge/main/Makefile
@@ -0,0 +1,5 @@
+all: emgdev
+emgdev:
+	docker build --compress -t epicmorg/edge .
+	docker push epicmorg/edge
+
diff --git a/epicmorg/edge/main/sources.list b/epicmorg/edge/main/sources.list
new file mode 100644
index 000000000..91edac4fa
--- /dev/null
+++ b/epicmorg/edge/main/sources.list
@@ -0,0 +1,15 @@
+#main
+deb http://ftp.ru.debian.org/debian/ sid main contrib non-free
+deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free
+deb http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free
+deb-src http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free
+deb http://ftp.ru.debian.org/debian/ testing-proposed-updates main contrib non-free
+deb-src http://ftp.ru.debian.org/debian/ testing-proposed-updates main contrib non-free
+
+#security
+deb http://ftp.ru.debian.org/debian-security/ testing-security main contrib non-free
+deb-src http://ftp.ru.debian.org/debian-security/ testing-security main contrib non-free
+
+##multimedia
+#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free
+#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free
diff --git a/epicmorg/prod/jdk11/Dockerfile b/epicmorg/prod/jdk11/Dockerfile
index 4601e9a69..03dc3feb3 100644
--- a/epicmorg/prod/jdk11/Dockerfile
+++ b/epicmorg/prod/jdk11/Dockerfile
@@ -2,12 +2,29 @@ FROM epicmorg/prod
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   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 autoremove -y && \
     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 && \
diff --git a/epicmorg/prod/jdk8/Dockerfile b/epicmorg/prod/jdk8/Dockerfile
index 4d5d8c7b4..98d6b682e 100644
--- a/epicmorg/prod/jdk8/Dockerfile
+++ b/epicmorg/prod/jdk8/Dockerfile
@@ -2,12 +2,29 @@ FROM epicmorg/prod
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   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 autoremove -y && \
     apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot
 
 ##################################################################
diff --git a/epicmorg/prod/main/Dockerfile b/epicmorg/prod/main/Dockerfile
index e41d7f189..b7bcc64e8 100644
--- a/epicmorg/prod/main/Dockerfile
+++ b/epicmorg/prod/main/Dockerfile
@@ -1,7 +1,23 @@
-FROM debian:buster
+FROM debian:buster-slim
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   buster sources list
 ##################################################################
@@ -10,6 +26,7 @@ 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
+RUN for i in $(seq 1 8); do mkdir -p "/usr/share/man/man${i}"; done
 
 ##################################################################
 #                   installing utils
diff --git a/nextcloud/16/Dockerfile b/nextcloud/16/Dockerfile
index 2ab40d8be..420e0dcb4 100644
--- a/nextcloud/16/Dockerfile
+++ b/nextcloud/16/Dockerfile
@@ -1,6 +1,22 @@
 FROM nextcloud:16
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #smb additional magic
 ADD php-smbclient-latest.tar.gz /tmp
 RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \
diff --git a/nextcloud/17/Dockerfile b/nextcloud/17/Dockerfile
index 15be670b0..f345d7440 100644
--- a/nextcloud/17/Dockerfile
+++ b/nextcloud/17/Dockerfile
@@ -1,6 +1,22 @@
 FROM nextcloud:17
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #smb additional magic
 ADD php-smbclient-latest.tar.gz /tmp
 RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \
diff --git a/nextcloud/18/Dockerfile b/nextcloud/18/Dockerfile
index 9038ea57a..1d87a0a9c 100644
--- a/nextcloud/18/Dockerfile
+++ b/nextcloud/18/Dockerfile
@@ -1,6 +1,22 @@
 FROM nextcloud:18
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #smb additional magic
 ADD php-smbclient-latest.tar.gz /tmp
 RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \
diff --git a/nextcloud/latest/Dockerfile b/nextcloud/latest/Dockerfile
index dc0e55f7f..835db1dd4 100644
--- a/nextcloud/latest/Dockerfile
+++ b/nextcloud/latest/Dockerfile
@@ -1,6 +1,22 @@
 FROM nextcloud:latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #smb additional magic
 ADD php-smbclient-latest.tar.gz /tmp
 RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \
diff --git a/qbittorrent/latest/Dockerfile b/qbittorrent/latest/Dockerfile
index 758ad51a0..d3102702d 100644
--- a/qbittorrent/latest/Dockerfile
+++ b/qbittorrent/latest/Dockerfile
@@ -1,7 +1,23 @@
-FROM epicmorg/devel
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
diff --git a/qbittorrent/stable/Dockerfile b/qbittorrent/stable/Dockerfile
index 54dc0bf01..646d1e848 100644
--- a/qbittorrent/stable/Dockerfile
+++ b/qbittorrent/stable/Dockerfile
@@ -1,7 +1,23 @@
-FROM epicmorg/devel
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile
index 7b2da62c9..989f9dc8c 100644
--- a/teamcity-agent/Dockerfile
+++ b/teamcity-agent/Dockerfile
@@ -2,6 +2,22 @@ FROM epicmorg/devel:jdk8
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   teamcity minimal agent
 ##################################################################
diff --git a/teamcity-agent/Makefile b/teamcity-agent/Makefile
index 589ca6d1c..a1e173ea9 100644
--- a/teamcity-agent/Makefile
+++ b/teamcity-agent/Makefile
@@ -1,4 +1,4 @@
 all: tca
 tca:
 	docker build --compress -t epicmorg/teamcity-agent:latest .
-
+	docker push epicmorg/teamcity-agent:latest
diff --git a/websites/latest/Dockerfile b/websites/latest/Dockerfile
index 5259091cd..61486d9a4 100644
--- a/websites/latest/Dockerfile
+++ b/websites/latest/Dockerfile
@@ -2,6 +2,22 @@ FROM epicmorg/prod
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   Installing Apache2 + PHP7
 ##################################################################
diff --git a/websites/latest/Makefile b/websites/latest/Makefile
index fdb3736cb..87bc7ce7c 100644
--- a/websites/latest/Makefile
+++ b/websites/latest/Makefile
@@ -1,4 +1,4 @@
 all: php
 php:
-	docker build --compress -t epicmorg/websites .
-
+	docker build --compress -t epicmorg/websites:latest .
+	docker push  epicmorg/websites:latest
diff --git a/websites/php7.2/Dockerfile b/websites/php7.2/Dockerfile
index 61d2bc8b7..eed516723 100644
--- a/websites/php7.2/Dockerfile
+++ b/websites/php7.2/Dockerfile
@@ -2,6 +2,22 @@ FROM epicmorg/prod
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   Installing Apache2 + PHP7
 ##################################################################
diff --git a/websites/php7.2/Makefile b/websites/php7.2/Makefile
index 833e8e82f..a15fcdd63 100644
--- a/websites/php7.2/Makefile
+++ b/websites/php7.2/Makefile
@@ -1,4 +1,4 @@
 all: php
 php:
 	docker build --compress -t epicmorg/websites:php7.2 .
-
+	docker push epicmorg/websites:php7.2
diff --git a/zabbix/agent/Dockerfile b/zabbix/agent/Dockerfile
index 7282162a6..d21a99d15 100644
--- a/zabbix/agent/Dockerfile
+++ b/zabbix/agent/Dockerfile
@@ -1,6 +1,21 @@
 FROM zabbix/zabbix-agent:ubuntu-latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
 
 #editing sources list
 RUN rm /etc/apt/sources.list
diff --git a/zabbix/java-gateway/Dockerfile b/zabbix/java-gateway/Dockerfile
index 337e2ea4a..998410762 100644
--- a/zabbix/java-gateway/Dockerfile
+++ b/zabbix/java-gateway/Dockerfile
@@ -1,6 +1,21 @@
 FROM zabbix/zabbix-java-gateway:ubuntu-latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
 
 #editing sources list
 RUN rm /etc/apt/sources.list
diff --git a/zabbix/server/Dockerfile b/zabbix/server/Dockerfile
index 228b4a103..9042ad89d 100644
--- a/zabbix/server/Dockerfile
+++ b/zabbix/server/Dockerfile
@@ -1,6 +1,21 @@
 FROM zabbix/zabbix-server-mysql:ubuntu-latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
 
 #editing sources list
 RUN rm /etc/apt/sources.list
diff --git a/zabbix/web/Dockerfile b/zabbix/web/Dockerfile
index 136e489ab..efe03a98e 100644
--- a/zabbix/web/Dockerfile
+++ b/zabbix/web/Dockerfile
@@ -1,6 +1,22 @@
 FROM zabbix/zabbix-web-apache-mysql:ubuntu-latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #editing sources list
 RUN rm /etc/apt/sources.list
 COPY sources.list /etc/apt/sources.list