diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c42c0c2..4c5afa5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,7 +36,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: netcorelink/libchttpx
+          images: noneandundefined/libchttpx
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=ref,event=branch
diff --git a/Dockerfile b/Dockerfile
index 042c240..6ac8213 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,7 @@ FROM debian:bookworm-slim AS builder
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        gcc \
-        make \
+        build-essential \
         libcjson-dev \
         pkg-config \
     && rm -rf /var/lib/apt/lists/*
@@ -32,8 +31,7 @@ FROM debian:bookworm-slim
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        gcc \
-        make \
+        build-essential \
         libcjson-dev \
         pkg-config \
     && rm -rf /var/lib/apt/lists/*
@@ -46,7 +44,7 @@ RUN ldconfig \
     && test -d /usr/local/include/libchttpx
 
 LABEL org.opencontainers.image.source="https://github.com/netcorelink/libchttpx" \
-      org.opencontainers.image.description="libchttpx C HTTP/WebSocket library (dev base image)" \
+      org.opencontainers.image.description="A powerful, cross-platform HTTP server library in C/C++ for building full-featured web servers." \
       org.opencontainers.image.licenses="MIT"
 
 WORKDIR /app