diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c3314d97..6e49266a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -19,6 +19,9 @@ jobs:
           - context: ./front
             label: front
             image: zoriya/kyoo_front
+          - context: ./scanner
+            label: scanner
+            image: zoriya/kyoo_scanner
     name: Build ${{matrix.label}}
     steps:
       - uses: actions/checkout@v2
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 4141960b..3d6abe5b 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -36,6 +36,18 @@ services:
       - KYOO_URL=${KYOO_URL:-http://back:5000}
       - PUBLIC_BACK_URL=${PUBLIC_BACK_URL}
 
+  scanner:
+    build: ./scanner
+    restart: on-failure
+    depends_on:
+      - back
+    env_file:
+      - ./.env
+    environment:
+      - KYOO_URL=${KYOO_URL:-http://back:5000}
+    volumes:
+      - ${LIBRARY_ROOT}:/video
+
   ingress:
     image: nginx
     restart: on-failure
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 3c115f52..8b52cd46 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -20,6 +20,18 @@ services:
       - KYOO_URL=${KYOO_URL:-http://back:5000}
       - PUBLIC_BACK_URL=${PUBLIC_BACK_URL}
 
+  scanner:
+    image: zoriya/kyoo_scanner:edge
+    restart: on-failure
+    depends_on:
+      - back
+    env_file:
+      - ./.env
+    environment:
+      - KYOO_URL=${KYOO_URL:-http://back:5000}
+    volumes:
+      - ${LIBRARY_ROOT}:/video
+
   ingress:
     image: nginx
     restart: on-failure
diff --git a/docker-compose.yml b/docker-compose.yml
index d0714eb1..64c9fd77 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,18 @@ services:
       - KYOO_URL=${KYOO_URL:-http://back:5000}
       - PUBLIC_BACK_URL=${PUBLIC_BACK_URL}
 
+  scanner:
+    build: ./scanner
+    restart: on-failure
+    depends_on:
+      - back
+    env_file:
+      - ./.env
+    environment:
+      - KYOO_URL=${KYOO_URL:-http://back:5000}
+    volumes:
+      - ${LIBRARY_ROOT}:/video
+
   ingress:
     image: nginx
     restart: on-failure
diff --git a/scanner/Dockerfile b/scanner/Dockerfile
new file mode 100644
index 00000000..9702a113
--- /dev/null
+++ b/scanner/Dockerfile
@@ -0,0 +1,8 @@
+FROM python:latest
+WORKDIR /app
+
+COPY ./requirements.txt .
+RUN pip3 install -r ./requirements.txt
+
+COPY . .
+CMD python3 -m scanner -v