diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index a18412c..6ba9dd4 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -43,8 +43,16 @@ jobs:
 
             echo "==> Updating Node version for Docker..."
             NODE_VER=$(cat .node-version)
+            # Ensure a trailing newline exists before appending
+            echo "" >> .env
             sed -i '/^NODE_VERSION=/d' .env || true
             echo "NODE_VERSION=${NODE_VER}-alpine" >> .env
+            
+            echo "==> Merging server/.env into root .env for Docker Compose interpolation..."
+            if [ -f server/.env ]; then
+              echo "" >> .env
+              cat server/.env >> .env
+            fi
 
             echo "==> Running Build..."
             # If this build fails, 'set -e' aborts the script instantly.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index dc810a7..0cf8b94 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -18,6 +18,7 @@ jobs:
       - name: Update Docker env with Node version
         run: |
           NODE_VER=$(cat /home/adipu/LabWise/.node-version)
+          echo "" >> /home/adipu/LabWise/.env
           sed -i '/^NODE_VERSION=/d' /home/adipu/LabWise/.env || true
           echo "NODE_VERSION=${NODE_VER}-alpine" >> /home/adipu/LabWise/.env