diff --git a/.github/workflows/build_branch.yml b/.github/workflows/build_branch.yml
index 70e4663..e0f2177 100644
--- a/.github/workflows/build_branch.yml
+++ b/.github/workflows/build_branch.yml
@@ -121,7 +121,8 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set Password
-        run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
+        run: 
+          echo "DB_PASSWORD=password" >> .env
       -
         name: Set Image
         run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 556c367..4909b9d 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -151,7 +151,8 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set Password
-        run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
+        run: 
+          echo "DB_PASSWORD=password" >> .env
       -
         name: Set Image
         run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
diff --git a/.github/workflows/nightly-alpha.yml b/.github/workflows/nightly-alpha.yml
index 3e1cc68..f4e45a2 100644
--- a/.github/workflows/nightly-alpha.yml
+++ b/.github/workflows/nightly-alpha.yml
@@ -181,7 +181,8 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set Password
-        run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
+        run: 
+          echo "DB_PASSWORD=password" >> .env
       -
         name: Set Image
         run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 79a0ffe..937ebdb 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -178,7 +178,8 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set Password
-        run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
+        run: 
+          echo "DB_PASSWORD=password" >> .env
       -
         name: Set Image
         run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9fdd21a..00d3c29 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -153,7 +153,8 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set Password
-        run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
+        run: 
+          echo "DB_PASSWORD=password" >> .env
       -
         name: Set Image
         run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
diff --git a/.github/workflows/test_pull.yml b/.github/workflows/test_pull.yml
index e8d3f44..3aba464 100644
--- a/.github/workflows/test_pull.yml
+++ b/.github/workflows/test_pull.yml
@@ -197,7 +197,8 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Set Password
-        run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
+        run: 
+          echo "DB_PASSWORD=password" >> .env
       -
         name: Set Image
         run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.event.workflow_run.id }}|' docker-compose.yml"
diff --git a/docker-compose.yml b/docker-compose.yml
index c651e3c..fa2a775 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,7 +41,7 @@ services:
     restart: unless-stopped
 
   lychee:
-    image: lycheeorg/lychee:nightly
+    image: lycheeorg/lychee
     container_name: lychee
     ports:
       - 90:80
@@ -54,8 +54,8 @@ services:
     networks:
       - lychee
     environment:
-      #- PUID=1000
-      #- PGID=1000
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
       # PHP timezone e.g. PHP_TZ=America/New_York
       - PHP_TZ=${TIMEZONE:-UTC}
       - TIMEZONE=${TIMEZONE:-UTC}