diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml
index 5129ba8b2..c42f0a5eb 100644
--- a/.github/workflows/nightly-docker.yml
+++ b/.github/workflows/nightly-docker.yml
@@ -1,33 +1,36 @@
-name: ci
+name: CI to Docker Hub
 
 on:
   push:
     branches:
-      - 'master'
+      - 'develop'
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
+
+      - name: Check Out Repo
+        uses: actions/checkout@v2
+
+      - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
         with:
+          context: ./
+          file: ./Dockerfile
           push: true
-          tags: user/app:latest
-      -
-        name: Image digest
+          tags: kizaing/kavita:nightly-amd64
+
+      - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file
diff --git a/API/DTOs/RegisterDto.cs b/API/DTOs/RegisterDto.cs
index bcc93954f..d04c2a03e 100644
--- a/API/DTOs/RegisterDto.cs
+++ b/API/DTOs/RegisterDto.cs
@@ -7,7 +7,7 @@ namespace API.DTOs
         [Required]
         public string Username { get; init; }
         [Required]
-        [StringLength(32, MinimumLength = 4)]
+        [StringLength(32, MinimumLength = 6)]
         public string Password { get; init; }
         public bool IsAdmin { get; init; }
     }
diff --git a/API/DTOs/ResetPasswordDto.cs b/API/DTOs/ResetPasswordDto.cs
index 535d0df2f..4b3ee3580 100644
--- a/API/DTOs/ResetPasswordDto.cs
+++ b/API/DTOs/ResetPasswordDto.cs
@@ -7,7 +7,7 @@ namespace API.DTOs
         [Required]
         public string UserName { get; init; }
         [Required]
-        [StringLength(16, MinimumLength = 4)]
+        [StringLength(32, MinimumLength = 6)]
         public string Password { get; init; }
     }
 }
\ No newline at end of file