diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4a1be2ff..55de4897 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,13 +8,32 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     steps:
       - uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: Push to GitHub Packages
+        with:
+          submodules: recursive
+      - name: Docker meta
+        id: meta
+        uses: crazy-max/ghaction-docker-meta@v2
+        with:
+          images: ghcr.io/${{github.repository_owner}}/Kyoo
+          tags: |
+            type=ref,event=tag
+            type=ref,event=branch
+            type=ref,event=pr
+            type=sha,prefix=
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{github.repository_owner}}
+          password: ${{secrets.GITHUB_TOKEN}}
+      - name: Build and push
+        id: docker_build
         uses: docker/build-push-action@v2
         with:
-          username: ${{github.actor}}
-          password: ${{secrets.GITHUB_TOKEN}}
-          registry: docker.pkg.github.com
-          repository: AnonymusRaccoon/Kyoo/kyoo
-          tag_with_sha: true
+          context: .
+          push: true
+          tags: ${{steps.meta.outputs.tags}}
diff --git a/README.md b/README.md
index 71cb21e2..0e25cbd6 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,8 @@ For arch based, debian based or rpm compatible distributions, a package is autom
  - [Debian](https://nightly.link/AnonymusRaccoon/Kyoo/workflows/release/master/kyoo_debian.zip)
  - [RPM](https://nightly.link/AnonymusRaccoon/Kyoo/workflows/release/master/kyoo_rpm.zip)
 
+A docker file is also available and an up-to-date docker image is available at: `ghcr.io/anonymusraccoon/kyoo:master`. An example docker-compose image is available at the root of the repository. You can customise it to feet your needs and use a prebuild image or you can build it from source. To do that, clone the repository with the `--recurse` flag and run `docker-compose up `.
+
 ## Repositories
 
 This is the main repository for Kyoo. Here, you will find all the server's code, the build process & the login page.