diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c6293c1..fb2c838 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -28,7 +28,7 @@ jobs:
 
     environment:
       name: docker
-      url: https://hub.docker.com/r/cssnr/chat-server
+      url: https://hub.docker.com/r/${{ github.repository }}
 
     steps:
       - name: "Checkout"
@@ -132,6 +132,14 @@ jobs:
           build-args: |
             VERSION=${{ github.ref_name }}
 
+      - name: "Docker Hub Description"
+        uses: peter-evans/dockerhub-description@v5
+        continue-on-error: true
+        with:
+          username: ${{ vars.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_PASS }}
+          repository: ${{ github.repository }}
+
       - name: "Send Failure Notification"
         if: ${{ failure() }}
         uses: sarisia/actions-status-discord@eb045afee445dc055c18d3d90bd0f244fd062708 # v1.16.0
diff --git a/README.md b/README.md
index e94d457..07c69c1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 [![GitHub Release Version](https://img.shields.io/github/v/release/cssnr/chat-server?logo=github)](https://github.com/cssnr/chat-server/releases/latest)
-[![Image Latest](https://badges.cssnr.com/ghcr/tags/cssnr/chat-server/latest)](https://github.com/cssnr/chat-server/pkgs/container/chat-server)
-[![Image Size](https://badges.cssnr.com/ghcr/size/cssnr/chat-server)](https://github.com/cssnr/chat-server/pkgs/container/chat-server)
+[![GHCR Latest](https://badges.cssnr.com/ghcr/tags/cssnr/chat-server/latest?label=ghcr)](https://github.com/cssnr/chat-server/pkgs/container/chat-server)
+[![Docker Hub Latest](https://img.shields.io/docker/v/cssnr/chat-server?sort=semver&logo=docker&logoColor=white&label=hub)](https://hub.docker.com/r/cssnr/chat-server)
+[![GHCR Size](https://badges.cssnr.com/ghcr/size/cssnr/chat-server?label=ghcr)](https://github.com/cssnr/chat-server/pkgs/container/chat-server)
+[![Docker Hub Size](https://img.shields.io/docker/image-size/cssnr/chat-server?logo=docker&logoColor=white&label=hub)](https://hub.docker.com/r/cssnr/chat-server)
 [![Deployment Docker](https://img.shields.io/github/deployments/cssnr/chat-server/docker?logo=docker&logoColor=white&label=docker)](https://github.com/cssnr/chat-server/deployments/docker)
 [![Workflow Release](https://img.shields.io/github/actions/workflow/status/cssnr/chat-server/release.yaml?logo=norton&logoColor=white&label=release)](https://github.com/cssnr/chat-server/actions/workflows/release.yaml)
 [![Workflow Lint](https://img.shields.io/github/actions/workflow/status/cssnr/chat-server/lint.yaml?logo=norton&logoColor=white&label=lint)](https://github.com/cssnr/chat-server/actions/workflows/lint.yaml)
@@ -64,7 +66,7 @@ Built with the [AI SDK](https://ai-sdk.dev/).
 With Docker.
 
 ```shell
-docker run --rm -p 80:3000 ghcr.io/cssnr/chat-server:latest
+docker run --rm cssnr/chat-server:latest
 ```
 
 With Docker Compose.
@@ -72,12 +74,10 @@ With Docker Compose.
 ```yaml
 services:
   chat:
-    image: ghcr.io/cssnr/chat-server:latest
+    image: cssnr/chat-server:latest
     environment:
       MODEL: 'gemini-2.5-flash'
       GOOGLE_GENERATIVE_AI_API_KEY: 'xxx'
-    ports:
-      - '80:3000'
 ```
 
 With Node.
@@ -87,7 +87,7 @@ npm i
 npm start
 ```
 
-_Note: you will need to export or add your environment variables to the `settings.env` file._
+_Note: you will need to export your environment variables or set them in the `settings.env` file._
 
 For a Docker Swarm + Traefik + Basic Auth example see the [docker-compose-swarm.yaml](https://github.com/cssnr/chat-server/blob/master/docker-compose-swarm.yaml).
 
diff --git a/docker-compose-swarm.yaml b/docker-compose-swarm.yaml
index 5c5b6ac..9f526d6 100644
--- a/docker-compose-swarm.yaml
+++ b/docker-compose-swarm.yaml
@@ -33,7 +33,7 @@ services:
       - traefik-public
 
   app:
-    image: ghcr.io/cssnr/chat-server:${VERSION:-latest}
+    image: cssnr/chat-server:${VERSION:-latest}
     environment:
       VERSION: ${VERSION}
       STACK_NAME: ${STACK_NAME}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 825ddfb..9ab6a25 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -20,7 +20,7 @@ services:
       - "${PORT:-80}:80"
 
   app:
-    image: ghcr.io/cssnr/chat-server:latest
+    image: cssnr/chat-server:latest
     env_file: settings.env
     #healthcheck:
     #  test: ["CMD-SHELL", "curl -sf localhost:3000/app-health-check || exit 1"]
diff --git a/render.yaml b/render.yaml
index 7fcb63e..5a07f35 100644
--- a/render.yaml
+++ b/render.yaml
@@ -4,7 +4,7 @@ services:
     plan: free
     runtime: image
     image:
-      url: ghcr.io/cssnr/chat-server:latest
+      url: cssnr/chat-server:latest
     dockerCommand: npm start
     #healthCheckPath: /app-health-check
     envVars: