diff --git a/.github/workflows/build_images.yaml b/.github/workflows/build_images.yaml
new file mode 100644
index 0000000..bd2e8ee
--- /dev/null
+++ b/.github/workflows/build_images.yaml
@@ -0,0 +1,43 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - 'master'
+    paths:
+      - src/**
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - context: ./src/node/addon/
+            tag: gabisonfire/knightcrawler-addon:latest
+          - context: ./src/node/addon-jackett/
+            tag: gabisonfire/knightcrawler-addon-jackett:latest
+          - context: ./src/node/consumer/
+            tag: gabisonfire/knightcrawler-consumer:latest
+          - context: ./src/producer/
+            tag: gabisonfire/knightcrawler-producer:latest
+    steps:
+      - 
+        name: Checkout repository
+        uses: actions/checkout@v4
+      - 
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - 
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - 
+        name: Build and push ${{ matrix.tag }}
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ matrix.context }}
+          push: true
+          tags: ${{ matrix.tag }}
\ No newline at end of file
diff --git a/deployment/docker/docker-compose.yaml b/deployment/docker/docker-compose.yaml
index 86fbb0e..2f0b12b 100644
--- a/deployment/docker/docker-compose.yaml
+++ b/deployment/docker/docker-compose.yaml
@@ -81,9 +81,7 @@ services:
       - knightcrawler-network
 
   producer:
-    build:
-      context: ../../src/producer
-      dockerfile: Dockerfile
+    image: gabisonfire/knightcrawler-producer:latest
     labels:
       logging: "promtail"
     env_file:
@@ -93,9 +91,7 @@ services:
       - knightcrawler-network
 
   consumer:
-    build:
-      context: ../../src/node/consumer
-      dockerfile: Dockerfile
+    image: gabisonfire/knightcrawler-consumer:latest
     env_file:
       - .env
     labels:
@@ -107,9 +103,7 @@ services:
       - knightcrawler-network
 
   addon:
-    build:
-      context: ../../src/node/addon
-      dockerfile: Dockerfile
+    image: gabisonfire/knightcrawler-addon:latest
     ports:
       - "7000:7000"
     labels: