diff --git a/Dockerfile b/Dockerfile
index 9280719..db1d550 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,14 @@
 # Base
-## For AMD64 Servers:
-FROM ark.sudovanilla.org/korbs/node:alpine AS based
-## For ARM64 Servers:
-## FROM ark.sudovanilla.org/korbs/bun:arm64 as based
+FROM oven/bun:alpine AS based
+
+# Metadata
+LABEL org.opencontainers.image.title="ButterflyVu"
+LABEL org.opencontainers.image.vendor="SudoVanilla"
+LABEL org.opencontainers.image.description="Documentations built on Astro"
+LABEL org.opencontainers.image.licenses="MIT NON-AI License"
+LABEL org.opencontainers.image.url="https://butterflyvu.docs.sudovanilla.org/"
+LABEL org.opencontainers.image.source="https://ark.sudovanilla.org/Korbs/ButterflyVu/"
+LABEL org.opencontainers.image.version="0.1.6"
 
 # Copy Files
 WORKDIR /app
@@ -10,4 +16,4 @@ COPY . .
 
 # Run
 EXPOSE 2014
-CMD npm run build && npm run preview
\ No newline at end of file
+CMD bun run build && bun run preview
\ No newline at end of file
diff --git a/package.json b/package.json
index b59f6c9..4d0e44a 100755
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "preview": "astro preview",
     "docker:start": "docker compose up -d",
     "docker:stop": "docker compose down",
-    "docker:build": "buildah build -t oci.registry.sudovanilla.org/butterflyvu --no-cache --annotation 'org.opencontainers.image.vendor=SudoVanilla' --annotation 'org.opencontainers.image.description=Documentations built on Astro' --annotation 'org.opencontainers.image.title=ButterflyVu' --annotation 'org.opencontainers.image.licenses=MIT NON-AI License' --annotation 'org.opencontainers.image.url=https://ark.sudovanilla.org/Korbs/ButterflyVu'",
+    "docker:build": "buildah build -t oci.registry.sudovanilla.org/butterflyvu --no-cache",
     "docker:push": "buildah push oci.registry.sudovanilla.org/butterflyvu"
   },
   "dependencies": {