diff --git a/DockerfileBase b/DockerfileBase
index 2440bfef..c5c42f8b 100644
--- a/DockerfileBase
+++ b/DockerfileBase
@@ -1,14 +1,17 @@
 FROM python:3.11-alpine
 
 LABEL com.abhinavsingh.name="abhinavsingh/proxy.py" \
-    com.abhinavsingh.description="⚡ Fast • 🪶 Lightweight • 0️⃣ Dependency • 🔌 Pluggable • \
+    org.opencontainers.image.title="proxy.py" \
+    org.opencontainers.image.description="⚡ Fast • 🪶 Lightweight • 0️⃣ Dependency • 🔌 Pluggable • \
     😈 TLS interception • 🔒 DNS-over-HTTPS • 🔥 Poor Man's VPN • ⏪ Reverse & ⏩ Forward • \
     👮🏿 \"Proxy Server\" framework • 🌐 \"Web Server\" framework • ➵ ➶ ➷ ➠ \"PubSub\" framework • \
     👷 \"Work\" acceptor & executor framework" \
-    com.abhinavsingh.url="https://github.com/abhinavsingh/proxy.py" \
-    com.abhinavsingh.vcs-url="https://github.com/abhinavsingh/proxy.py" \
+    org.opencontainers.url="https://github.com/abhinavsingh/proxy.py" \
+    org.opencontainers.image.source="https://github.com/abhinavsingh/proxy.py" \
     com.abhinavsingh.docker.cmd="docker run -it --rm -p 8899:8899 abhinavsingh/proxy.py" \
-    org.opencontainers.image.source="https://github.com/abhinavsingh/proxy.py"
+    org.opencontainers.image.licenses="BSD-3-Clause" \
+    org.opencontainers.image.authors="Abhinav Singh <mailsforabhinav@gmail.com>" \
+    org.opencontainers.image.vendor="Abhinav Singh"
 
 ENV PYTHONUNBUFFERED 1
 
@@ -25,9 +28,9 @@ RUN apk update && apk --no-cache add \
     rust \
     make
 RUN python -m venv /proxy/venv && \
-    /proxy/venv/bin/pip install \
+    /proxy/venv/bin/pip install --no-cache-dir \
     -U pip wheel && \
-    /proxy/venv/bin/pip install \
+    /proxy/venv/bin/pip install --no-cache-dir \
     paramiko==3.4.0 \
     cryptography==39.0.1 \
     --prefer-binary