diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index 963d3687..53365087 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -26,20 +26,12 @@ jobs:
         run: |
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
-          echo "Checking if PR exists for ${{ github.ref_name }}"
-          tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep -q '${{ gitea.ref_name }}' 
+          echo "Checking if PR exists for ${{ github.ref_name }}..."
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ github.ref_name }}' | head -1 | egrep -q 'open'
           if [ $? -eq 0 ]; then
-            echo "PR exists, checking state..."
-            pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ github.ref_name }}' | awk -F',' '{print $4}')
-            if [ "${pr_state}" != 'open' ]; then
-              echo "PR does not exist, creating..."
-              tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}"
-            elif [ "${pr_state}" = 'open' ]; then
-              echo "PR already exists, skipping creation..."
-            fi
+            echo "An open PR exists, skipping creation..."
           elif [ $? -eq 1 ]; then
-            echo "PR does not exist, creating..."
+            echo "No open PRs, creating one..."
             tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}"
           fi
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 1015b8bc..75f67d57 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -556,7 +556,10 @@ services:
   castopod:
     container_name: castopod
     depends_on:
-      - mariadb
+      mariadb:
+        condition: service_started
+        required: true
+        restart: true
     environment:
       MYSQL_DATABASE: castopod
       MYSQL_USER: castopod
@@ -1706,6 +1709,7 @@ services:
       mariadb:
         condition: service_started
         required: true
+        restart: true
     environment:
       APP_ADMIN_EMAIL: charish.patel@trez.wtf
       APP_ADMIN_PASSWORD: ${HORTUSFOX_ADMIN_PASSWORD}
@@ -1868,6 +1872,11 @@ services:
           create_host_path: true
   invoice_ninja:
     container_name: invoice_ninja
+    depends_on:
+      mariadb:
+        condition: service_started
+        required: true
+        restart: true
     environment:
       APP_DEBUG: true
       APP_KEY: ${IN_APP_KEY}
@@ -3311,6 +3320,11 @@ services:
         volume: {}
   nextcloud:
     container_name: nextcloud
+    depends_on:
+      mariadb:
+        condition: service_started
+        required: true
+        restart: true
     environment:
       PGID: 1000
       PUID: 1000
@@ -3423,6 +3437,11 @@ services:
         type: bind
   paperless-ngx:
     container_name: paperless-ngx
+    depends_on:
+      mariadb:
+        condition: service_started
+        required: true
+        restart: true
     environment:
       PAPERLESS_DBENGINE: mariadb
       PAPERLESS_DBHOST: mariadb
@@ -6072,6 +6091,7 @@ services:
       mariadb:
         condition: service_started
         required: true
+        restart: true
       redis:
         condition: service_started
         required: true