diff --git a/dockerfile b/dockerfile
index 979360127..a7c22985d 100644
--- a/dockerfile
+++ b/dockerfile
@@ -11,6 +11,19 @@ RUN npm install --legacy-peer-deps && \
 
 
 FROM node:14-buster-slim AS release
+
+ARG BUILD_DATE
+
+LABEL org.opencontainers.image.authors='Louis Lam' \
+      org.opencontainers.image.url='https://uptime.kuma.pet' \
+      org.opencontainers.image.documentation='https://github.com/louislam/uptime-kuma/wiki' \
+      org.opencontainers.image.source='https://github.com/louislam/uptime-kuma.git' \
+      org.opencontainers.image.vendor='Louis Lam' \
+      org.opencontainers.image.licenses='MIT License' \
+      org.opencontainers.image.title="Uptime Kuma" \
+      org.opencontainers.image.description="Self-hosted uptime monitoring tool with notifications" \
+      org.opencontainers.image.created=$BUILD_DATE
+
 WORKDIR /app
 
 # Install Apprise, add sqlite3 cli for debugging in the future, iputils-ping for ping, util-linux for setpriv
diff --git a/dockerfile-alpine b/dockerfile-alpine
index f30da5b05..de4601682 100644
--- a/dockerfile-alpine
+++ b/dockerfile-alpine
@@ -10,6 +10,19 @@ RUN npm install --legacy-peer-deps && \
 
 
 FROM node:14-alpine3.12 AS release
+
+ARG BUILD_DATE
+
+LABEL org.opencontainers.image.authors='Louis Lam' \
+      org.opencontainers.image.url='https://uptime.kuma.pet' \
+      org.opencontainers.image.documentation='https://github.com/louislam/uptime-kuma/wiki' \
+      org.opencontainers.image.source='https://github.com/louislam/uptime-kuma.git' \
+      org.opencontainers.image.vendor='Louis Lam' \
+      org.opencontainers.image.licenses='MIT License' \
+      org.opencontainers.image.title="Uptime Kuma" \
+      org.opencontainers.image.description="Self-hosted uptime monitoring tool with notifications" \
+      org.opencontainers.image.created=$BUILD_DATE
+
 WORKDIR /app
 
 # Install apprise, iputils for non-root ping, setpriv
diff --git a/package.json b/package.json
index 5c3f8e034..7eccd9135 100644
--- a/package.json
+++ b/package.json
@@ -23,11 +23,11 @@
         "tsc": "tsc",
         "vite-preview-dist": "vite preview --host",
         "build-docker": "npm run build-docker-debian && npm run build-docker-alpine",
-        "build-docker-alpine": "docker buildx build -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.7.0-alpine --target release . --push",
-        "build-docker-debian": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.7.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.7.0-debian --target release . --push",
-        "build-docker-nightly": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
-        "build-docker-nightly-alpine": "docker buildx build -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
-        "build-docker-nightly-amd64": "docker buildx build --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
+        "build-docker-alpine": "docker buildx build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.7.0-alpine --target release . --push",
+        "build-docker-debian": "docker buildx build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.7.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.7.0-debian --target release . --push",
+        "build-docker-nightly": "docker buildx build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
+        "build-docker-nightly-alpine": "docker buildx build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
+        "build-docker-nightly-amd64": "docker buildx build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "setup": "git checkout 1.7.0 && npm install --legacy-peer-deps && node node_modules/esbuild/install.js && npm run build && npm prune",
         "update-version": "node extra/update-version.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",