diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 24b8e7a..be90475 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        directory: [watcher, recognizer, cert]
+        directory: [watcher, recognizer, web, cert]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ea1a201..634fe13 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        directory: [watcher, recognizer, cert]
+        directory: [watcher, recognizer, web, cert]
 
     steps:
       - name: Check out the repo
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index bea3627..f29693d 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,7 +1,7 @@
 version: "3.8"
 
 services:
-  chatwatcher:
+  watcher:
     build: ./watcher
     volumes:
       - type: bind
diff --git a/docker-compose.yml b/docker-compose.yml
index 9455ecb..43fb28e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
 version: "3.8"
 
 services:
-  chatwatcher:
-    image: ghcr.io/jaoafa/ChatWatcher-watcher:latest
+  watcher:
+    image: ghcr.io/jaoafa/chatwatcher-watcher:latest
     volumes:
       - type: bind
         source: ./config.json
@@ -18,7 +18,7 @@ services:
     restart: always
 
   web:
-    image: ghcr.io/jaoafa/ChatWatcher-web:latest
+    image: ghcr.io/jaoafa/chatwatcher-web:latest
     environment:
       NGINX_SERVER_NAME: web
       NGINX_HSTS_MAX_AGE: 31536000
@@ -32,7 +32,7 @@ services:
     restart: always
 
   cert:
-    image: ghcr.io/jaoafa/ChatWatcher-cert:latest
+    image: ghcr.io/jaoafa/chatwatcher-cert:latest
     build:
       context: ./web
       dockerfile: ./cert.Dockerfile