diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index dd45635..c2715b2 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,18 +1,38 @@
-name: Docker Image CI
+# .github/workflows/docker-image.yml
+# Author: Tim Chaubet
+
+name: Docker Image CI/CD
 
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
+  workflow_dispatch:  # Allows you to run this manually from the Actions tab
 
 jobs:
-
-  build:
-
+  build-and-push:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag vrising:$(date +%s)
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          # Make sure these match the Secret names in your GitHub Settings
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and Push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          # This updates 'latest' and adds a unique tag based on the commit hash
+          tags: |
+            trueosiris/vrising:latest
+            trueosiris/vrising:${{ github.sha }}
\ No newline at end of file
diff --git a/README.md b/README.md
index f34e832..4447e7b 100755
--- a/README.md
+++ b/README.md
@@ -27,7 +27,8 @@
 Docker image rebuild + tested on a linux dockerhost (unraid).<br>
 For now, u need to add this to the compose file:<br>
 `entrypoint: ["/bin/bash", "-c", "sed -i 's/\\r//g' /start.sh && exec /bin/bash /start.sh"]` <br>
-Thx [laerdev](https://github.com/laerdev) for the fix.<br>
+Thanks to [laerdev](https://github.com/laerdev) for the fix.<br>
+
 
 ### image 2025-08-01