diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml
index 8bb3a22..0148346 100644
--- a/.forgejo/workflows/CD.yml
+++ b/.forgejo/workflows/CD.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   deploy:
     if: github.event.pull_request.merged == true
-    runs-on: ubuntu-22.04
+    runs-on: docker
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -20,13 +20,32 @@ jobs:
           if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then
             git fetch --unshallow
           fi
-          folders=$(git diff --name-only HEAD~1 HEAD | cut -d/ -f1 | sort | uniq)
+          folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f2 | sort | uniq)
           echo "Modified folders: $folders"
           echo "::set-output name=folders::$folders"
 
+      - name: Set condition for deployment
+        id: set-condition
+        run: |
+          if [ -z "${{ steps.detect-changes.outputs.folders }}" ]; then
+            echo "No relevant changes detected."
+            echo "::set-output name=continue::false"
+          else
+            echo "Relevant changes detected."
+            echo "::set-output name=continue::true"
+          fi
+
+  conditional-deploy:
+    if: needs.deploy.outputs.continue == 'true'
+    runs-on: docker
+    needs: deploy
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Deploy to hosts
         run: |
-          IFS=' ' read -r -a folder_array <<< "${{ steps.detect-changes.outputs.folders }}"
+          IFS=' ' read -r -a folder_array <<< "${{ needs.deploy.outputs.folders }}"
           for folder in "${folder_array[@]}"; do
             case $folder in
               arrs)
@@ -83,8 +102,8 @@ jobs:
               -d "{\"extra_vars\": {\"target_host\": \"$target_host\", \"folder\": \"$folder\"}}" \
               "https://awx.mafyuh.xyz/api/v2/job_templates/13/launch/"
 
-            sleep 45  # Delay for 45 seconds before fetching logs
-
+            sleep 45  
+            
             job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id')
             logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json)
             echo "AWX Job Logs for folder: $folder"
diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml
index ce53c2d..10c770e 100644
--- a/.forgejo/workflows/yamllint.yml
+++ b/.forgejo/workflows/yamllint.yml
@@ -17,14 +17,10 @@ jobs:
         with:
           node-version: 14
 
-      - name: Install yamllint
-        run: | 
-          npm install -g yaml-lint
-
       - name: Show yamllint version
         run: | 
           yamllint --version
 
       - name: Lint .yml files
         run: | 
-          yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" ./**/*.yml
\ No newline at end of file
+          yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" docker/**/*.yml
\ No newline at end of file
diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml
index 20d278c..0fa4c92 100644
--- a/docker/arrs/docker-compose.yml
+++ b/docker/arrs/docker-compose.yml
@@ -1,7 +1,7 @@
 ---
 services:
   bazarr:
-    image: ghcr.io/linuxserver/bazarr@sha256:5da74fc1bbd5da69e3b4f9b2376f6ccfbe3b47f143e6eb5651ed37cc1d4412dd
+    image: ghcr.io/linuxserver/bazarr@sha256:25f0d19ba9226fdf15aec0fc7fa134ba89fc6f77f09d7bd45b33c5960c47821e
     container_name: bazarr
     ports:
       - "6767:6767"
@@ -43,7 +43,7 @@ services:
       - PGID=1000
 
   radarr:
-    image: ghcr.io/linuxserver/radarr@sha256:1eaf9e83fca2b9170d4f49f6c0e55ba38693718e7815743a9ec297d199ab1e73
+    image: ghcr.io/linuxserver/radarr@sha256:2a02b311cefb344cd0caf74a443b9d6318daf15bda5280a3bc732381db983dc3
     container_name: radarr
     ports:
       - "7878:7878"