diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fa950e2c..48997e77 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -51,6 +51,14 @@ jobs:
       - name: Set up Docker Buildx 🐳
         uses: docker/setup-buildx-action@v4
 
+      - name: Extract Docker metadata 🏷️
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.GHCR_REGISTRY }}/${{ env.DOCKER_USER }}/${{ env.IMAGE_NAME }}
+            ${{ env.DOCKERHUB_REGISTRY }}/${{ env.DOCKER_USER }}/${{ env.IMAGE_NAME }}
+
       - name: Login to GitHub Container Registry 🔑
         uses: docker/login-action@v4
         with:
@@ -72,6 +80,7 @@ jobs:
           file: ./Dockerfile
           push: true
           platforms: linux/amd64,linux/arm64/v8
+          labels: ${{ steps.meta.outputs.labels }}
           tags: |
             ${{ env.GHCR_TAG }}
             ${{ env.DOCKERHUB_TAG }}
diff --git a/Dockerfile b/Dockerfile
index f6156626..4e9c525c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ FROM node:${NODE_VERSION}-${DEBIAN_VERSION} AS build
 # Set the container's default shell to Bash and enable some options
 SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 
-# Install Chromium browser and Download and verify Google Chrome’s signing key
+# Install Chromium browser and Download and verify Google Chrome's signing key
 RUN apt-get update -qq --fix-missing && \
     apt-get -qqy install --allow-unauthenticated gnupg wget && \
     wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg && \
@@ -60,5 +60,12 @@ ENV CHROME_PATH='/usr/bin/chromium' \
     PUPPETEER_EXECUTABLE_PATH='/usr/bin/chromium' \
     PUPPETEER_SKIP_DOWNLOAD='true'
 
+LABEL org.opencontainers.image.title="Web-Check" \
+      org.opencontainers.image.description="All-in-one OSINT tool for analysing any website" \
+      org.opencontainers.image.url="https://web-check.xyz" \
+      org.opencontainers.image.source="https://github.com/lissy93/web-check" \
+      org.opencontainers.image.licenses="MIT" \
+      org.opencontainers.image.vendor="Alicia Sykes"
+
 # Define the command executed when the container starts and start the server.js of the Node.js application
 CMD ["yarn", "start"]