diff --git a/atlassian/bitbucket/latest/Dockerfile b/atlassian/bitbucket/latest/Dockerfile
index 3cec384db..e4dd232d7 100644
--- a/atlassian/bitbucket/latest/Dockerfile
+++ b/atlassian/bitbucket/latest/Dockerfile
@@ -2,22 +2,6 @@ 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 84e4351c7..053caa0ff 100644
--- a/atlassian/bitbucket/latest/Dockerfile.jdk11
+++ b/atlassian/bitbucket/latest/Dockerfile.jdk11
@@ -2,22 +2,6 @@ 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 e5c69c4e4..107b68b3b 100644
--- a/atlassian/confluence/latest/Dockerfile
+++ b/atlassian/confluence/latest/Dockerfile
@@ -2,22 +2,6 @@ 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 d6e1745c8..3aee00b73 100644
--- a/atlassian/confluence/latest/Dockerfile.jdk11
+++ b/atlassian/confluence/latest/Dockerfile.jdk11
@@ -2,22 +2,6 @@ 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 2aa25629b..947578d9a 100644
--- a/atlassian/jira/latest/Dockerfile
+++ b/atlassian/jira/latest/Dockerfile
@@ -2,22 +2,6 @@ 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 13b0d8d58..6902e4045 100644
--- a/atlassian/jira/latest/Dockerfile.jdk11
+++ b/atlassian/jira/latest/Dockerfile.jdk11
@@ -2,22 +2,6 @@ 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 5159056eb..de0dab894 100644
--- a/balancer/latest/Dockerfile
+++ b/balancer/latest/Dockerfile
@@ -2,18 +2,6 @@ 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
-##################################################################
-LABEL org.label-schema.build-date=${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=master \
-          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
-          org.label-schema.vendor="EpicMorg" \
-          org.label-schema.version=1.17.8 \
-          org.label-schema.schema-version="1.0"
 
 ##################################################################
 #                   ARGuments
@@ -172,18 +160,6 @@ FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
-##################################################################
-#   Build-time metadata as defined at http://label-schema.org
-##################################################################
-LABEL org.label-schema.build-date=${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=master \
-          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
-          org.label-schema.vendor="EpicMorg" \
-          org.label-schema.version=1.17.8 \
-          org.label-schema.schema-version="1.0"
 
 ##################################################################
 #                   Installing nginx from deb
diff --git a/balancer/latest/Makefile b/balancer/latest/Makefile
index fe0a0414d..70405e8a6 100644
--- a/balancer/latest/Makefile
+++ b/balancer/latest/Makefile
@@ -2,3 +2,4 @@ all: nginx
 
 nginx:
 	docker build --compress -t epicmorg/balancer:latest .
+	docker push epicmorg/balancer:latest
\ No newline at end of file
diff --git a/balancer/php/Dockerfile b/balancer/php/Dockerfile
index 0a580f2cd..d581153d5 100644
--- a/balancer/php/Dockerfile
+++ b/balancer/php/Dockerfile
@@ -2,19 +2,6 @@ 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
-##################################################################
-LABEL org.label-schema.build-date=${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=master \
-          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
-          org.label-schema.vendor="EpicMorg" \
-          org.label-schema.version=1.17.8 \
-          org.label-schema.schema-version="1.0"
-
 ##################################################################
 #                   Installing php fpn for nginx from deb
 ##################################################################
diff --git a/balancer/php/Makefile b/balancer/php/Makefile
index c65f48c72..8f8e7c04b 100644
--- a/balancer/php/Makefile
+++ b/balancer/php/Makefile
@@ -2,3 +2,4 @@ all: nginx
 
 nginx:
 	docker build --compress -t epicmorg/balancer:php .
+	docker push epicmorg/balancer:php
\ No newline at end of file
diff --git a/epicmorg/devel/jdk11/Dockerfile b/epicmorg/devel/jdk11/Dockerfile
index ba82941ea..721ebfcbc 100644
--- a/epicmorg/devel/jdk11/Dockerfile
+++ b/epicmorg/devel/jdk11/Dockerfile
@@ -2,22 +2,6 @@ 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
 ##################################################################
diff --git a/epicmorg/devel/jdk8/Dockerfile b/epicmorg/devel/jdk8/Dockerfile
index bda777f92..349f64c2b 100644
--- a/epicmorg/devel/jdk8/Dockerfile
+++ b/epicmorg/devel/jdk8/Dockerfile
@@ -2,22 +2,6 @@ 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
 ##################################################################
diff --git a/epicmorg/devel/main/Dockerfile b/epicmorg/devel/main/Dockerfile
index bda43a142..0e3ae6c13 100644
--- a/epicmorg/devel/main/Dockerfile
+++ b/epicmorg/devel/main/Dockerfile
@@ -2,22 +2,6 @@ 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/epicmorg/edge/jdk11/Dockerfile b/epicmorg/edge/jdk11/Dockerfile
index 62c0cf889..141402264 100644
--- a/epicmorg/edge/jdk11/Dockerfile
+++ b/epicmorg/edge/jdk11/Dockerfile
@@ -2,22 +2,6 @@ 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
 ##################################################################
diff --git a/epicmorg/edge/jdk8/Dockerfile b/epicmorg/edge/jdk8/Dockerfile
index 5672315af..e15c3a5e8 100644
--- a/epicmorg/edge/jdk8/Dockerfile
+++ b/epicmorg/edge/jdk8/Dockerfile
@@ -2,22 +2,6 @@ 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
 ##################################################################
diff --git a/epicmorg/edge/main/Dockerfile b/epicmorg/edge/main/Dockerfile
index 669c7e77f..a7d90902c 100644
--- a/epicmorg/edge/main/Dockerfile
+++ b/epicmorg/edge/main/Dockerfile
@@ -2,22 +2,6 @@ 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
 ##################################################################
diff --git a/epicmorg/prod/jdk11/Dockerfile b/epicmorg/prod/jdk11/Dockerfile
index 03dc3feb3..a8b973af1 100644
--- a/epicmorg/prod/jdk11/Dockerfile
+++ b/epicmorg/prod/jdk11/Dockerfile
@@ -2,22 +2,6 @@ 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
 ##################################################################
diff --git a/epicmorg/prod/jdk8/Dockerfile b/epicmorg/prod/jdk8/Dockerfile
index 98d6b682e..9ce3d8503 100644
--- a/epicmorg/prod/jdk8/Dockerfile
+++ b/epicmorg/prod/jdk8/Dockerfile
@@ -2,22 +2,6 @@ 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
 ##################################################################
diff --git a/epicmorg/prod/main/Dockerfile b/epicmorg/prod/main/Dockerfile
index b7bcc64e8..c64d463df 100644
--- a/epicmorg/prod/main/Dockerfile
+++ b/epicmorg/prod/main/Dockerfile
@@ -2,22 +2,6 @@ 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
 ##################################################################
diff --git a/nextcloud/16/Dockerfile b/nextcloud/16/Dockerfile
index 420e0dcb4..2ab40d8be 100644
--- a/nextcloud/16/Dockerfile
+++ b/nextcloud/16/Dockerfile
@@ -1,22 +1,6 @@
 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 f345d7440..15be670b0 100644
--- a/nextcloud/17/Dockerfile
+++ b/nextcloud/17/Dockerfile
@@ -1,22 +1,6 @@
 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 1d87a0a9c..9038ea57a 100644
--- a/nextcloud/18/Dockerfile
+++ b/nextcloud/18/Dockerfile
@@ -1,22 +1,6 @@
 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 835db1dd4..dc0e55f7f 100644
--- a/nextcloud/latest/Dockerfile
+++ b/nextcloud/latest/Dockerfile
@@ -1,22 +1,6 @@
 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 d3102702d..9d1f08757 100644
--- a/qbittorrent/latest/Dockerfile
+++ b/qbittorrent/latest/Dockerfile
@@ -2,22 +2,6 @@ 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 646d1e848..a6007cf0b 100644
--- a/qbittorrent/stable/Dockerfile
+++ b/qbittorrent/stable/Dockerfile
@@ -2,22 +2,6 @@ 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 989f9dc8c..7b2da62c9 100644
--- a/teamcity-agent/Dockerfile
+++ b/teamcity-agent/Dockerfile
@@ -2,22 +2,6 @@ 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/websites/latest/Dockerfile b/websites/latest/Dockerfile
index 61486d9a4..5259091cd 100644
--- a/websites/latest/Dockerfile
+++ b/websites/latest/Dockerfile
@@ -2,22 +2,6 @@ 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/Dockerfile b/websites/php7.2/Dockerfile
index eed516723..61d2bc8b7 100644
--- a/websites/php7.2/Dockerfile
+++ b/websites/php7.2/Dockerfile
@@ -2,22 +2,6 @@ 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/zabbix/agent/Dockerfile b/zabbix/agent/Dockerfile
index d21a99d15..7b92fd2f4 100644
--- a/zabbix/agent/Dockerfile
+++ b/zabbix/agent/Dockerfile
@@ -1,22 +1,6 @@
 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
 COPY sources.list /etc/apt/sources.list
diff --git a/zabbix/java-gateway/Dockerfile b/zabbix/java-gateway/Dockerfile
index 998410762..060d91649 100644
--- a/zabbix/java-gateway/Dockerfile
+++ b/zabbix/java-gateway/Dockerfile
@@ -1,22 +1,6 @@
 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
 COPY sources.list /etc/apt/sources.list
diff --git a/zabbix/server/Dockerfile b/zabbix/server/Dockerfile
index 9042ad89d..abb0f81f9 100644
--- a/zabbix/server/Dockerfile
+++ b/zabbix/server/Dockerfile
@@ -1,22 +1,6 @@
 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
 COPY sources.list /etc/apt/sources.list
diff --git a/zabbix/web/Dockerfile b/zabbix/web/Dockerfile
index efe03a98e..136e489ab 100644
--- a/zabbix/web/Dockerfile
+++ b/zabbix/web/Dockerfile
@@ -1,22 +1,6 @@
 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