diff --git a/Dockerfile b/Dockerfile
index 6a696a7..9f52294 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -215,19 +215,19 @@ WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
-LABEL org.opencontainers.image.license="${LICENSE}"
-LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
-LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdev/alpine"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/casjaysdev/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/alpine"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.3.14 b/Dockerfile.3.14
index 125171a..930040a 100644
--- a/Dockerfile.3.14
+++ b/Dockerfile.3.14
@@ -215,19 +215,19 @@ WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
-LABEL org.opencontainers.image.license="${LICENSE}"
-LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
-LABEL org.opencontainers.image.vcs-url="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.3.15 b/Dockerfile.3.15
index e79979b..ad22210 100644
--- a/Dockerfile.3.15
+++ b/Dockerfile.3.15
@@ -215,19 +215,19 @@ WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
-LABEL org.opencontainers.image.license="${LICENSE}"
-LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
-LABEL org.opencontainers.image.vcs-url="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.3.16 b/Dockerfile.3.16
index fe8f032..b1a0836 100644
--- a/Dockerfile.3.16
+++ b/Dockerfile.3.16
@@ -215,19 +215,19 @@ WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
-LABEL org.opencontainers.image.license="${LICENSE}"
-LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
-LABEL org.opencontainers.image.vcs-url="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.3.17 b/Dockerfile.3.17
index f4bf327..7525b91 100644
--- a/Dockerfile.3.17
+++ b/Dockerfile.3.17
@@ -215,19 +215,19 @@ WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
-LABEL org.opencontainers.image.license="${LICENSE}"
-LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
-LABEL org.opencontainers.image.vcs-url="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.3.18 b/Dockerfile.3.18
index 255c94e..5c03bb5 100644
--- a/Dockerfile.3.18
+++ b/Dockerfile.3.18
@@ -215,19 +215,19 @@ WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
-LABEL org.opencontainers.image.license="${LICENSE}"
-LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
-LABEL org.opencontainers.image.vcs-url="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.3.19 b/Dockerfile.3.19
index 54b3279..b900540 100644
--- a/Dockerfile.3.19
+++ b/Dockerfile.3.19
@@ -215,19 +215,19 @@ WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
-LABEL org.opencontainers.image.license="${LICENSE}"
-LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
-LABEL org.opencontainers.image.vcs-url="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.3.20 b/Dockerfile.3.20
index 59a0302..14554e8 100644
--- a/Dockerfile.3.20
+++ b/Dockerfile.3.20
@@ -215,19 +215,19 @@ WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
-LABEL org.opencontainers.image.license="${LICENSE}"
-LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
-LABEL org.opencontainers.image.vcs-url="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.edge b/Dockerfile.edge
index 6ad869c..52b8ce9 100644
--- a/Dockerfile.edge
+++ b/Dockerfile.edge
@@ -215,19 +215,19 @@ WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
 LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
-LABEL org.opencontainers.image.license="${LICENSE}"
-LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
-LABEL org.opencontainers.image.vcs-url="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"