diff --git a/Dockerfile b/Dockerfile
index c8f2ff4..e6fe6d9 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/ubuntu"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/casjaysdev/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/ubuntu"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.19.04 b/Dockerfile.19.04
index 00a3886..b08da11 100644
--- a/Dockerfile.19.04
+++ b/Dockerfile.19.04
@@ -216,19 +216,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/ubuntu"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/ubuntu"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.20.04 b/Dockerfile.20.04
index 4a46a9a..b4015f3 100644
--- a/Dockerfile.20.04
+++ b/Dockerfile.20.04
@@ -216,19 +216,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/ubuntu"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/ubuntu"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.21.04 b/Dockerfile.21.04
index 11fd2b1..96c3d63 100644
--- a/Dockerfile.21.04
+++ b/Dockerfile.21.04
@@ -216,19 +216,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/ubuntu"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/ubuntu"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.22.04 b/Dockerfile.22.04
index 07e9997..a645f5f 100644
--- a/Dockerfile.22.04
+++ b/Dockerfile.22.04
@@ -216,19 +216,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/ubuntu"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/ubuntu"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.23.04 b/Dockerfile.23.04
index 602d957..2869023 100644
--- a/Dockerfile.23.04
+++ b/Dockerfile.23.04
@@ -216,19 +216,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/ubuntu"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/ubuntu"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.23.10 b/Dockerfile.23.10
index e960d0e..e247bf2 100644
--- a/Dockerfile.23.10
+++ b/Dockerfile.23.10
@@ -216,19 +216,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/ubuntu"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/ubuntu"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.24.04 b/Dockerfile.24.04
index 427ff5a..282bde4 100644
--- a/Dockerfile.24.04
+++ b/Dockerfile.24.04
@@ -216,19 +216,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/ubuntu"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/ubuntu"
 LABEL com.github.containers.toolbox="false"
 
diff --git a/Dockerfile.24.10 b/Dockerfile.24.10
index 7b3e992..92cf6d3 100644
--- a/Dockerfile.24.10
+++ b/Dockerfile.24.10
@@ -216,19 +216,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/ubuntu"
-LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
+LABEL org.opencontainers.image.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/ubuntu"
 LABEL com.github.containers.toolbox="false"