diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index b4a1f727..2805f3cc 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -160,19 +160,22 @@ jobs:
       - name: Checkout
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
-      - name: Login to Gitea Container Registry
-        run: |
-          docker login -u gitea-sonarqube-bot -p ${RINOA_REGISTRY_PASSWORD} git.trez.wtf
+      # - name: Login to Gitea Container Registry
+      #   run: |
+      #     docker login -u gitea-sonarqube-bot -p ${RINOA_REGISTRY_PASSWORD} git.trez.wtf
 
       - name: Login to registries
         uses: docker/login-action@v3
         with:
           registry-auth: |
-            - username: ${{ vars.DOCKERHUB_USERNAME }}
-              password: ${{ secrets.DOCKERHUB_TOKEN }}
+            - username: ${{ secrets.DOCKERHUB_USER }}
+              password: ${{ secrets.DOCKERHUB_PASSWORD }}
             - registry: ghcr.io
-              username: ${{ github.actor }}
-              password: ${{ secrets.GITHUB_TOKEN }}
+              username: ${{ secrets.GHCR_USER }}
+              password: ${{ secrets.GITHUB_LOGIN_TOKEN }}
+            - registry: git.trez.wtf
+              username: ${{ secrets.BOT_GITEA_USER }}
+              password: ${{ secrets.BOT_GITEA_PASSWORD }}
 
       - name: Install Vault (only if not cached)
         uses: cpanato/vault-installer@main
@@ -408,11 +411,24 @@ jobs:
         with:
           version: ${{ env.HC_VAULT_VERSION }}
 
-      - name: Login to Gitea Container Registry
-        run: |
-          docker login -u gitea-sonarqube-bot \
-            -p ${RINOA_REGISTRY_PASSWORD} \
-            git.trez.wtf
+      # - name: Login to Gitea Container Registry
+      #   run: |
+      #     docker login -u gitea-sonarqube-bot \
+      #       -p ${RINOA_REGISTRY_PASSWORD} \
+      #       git.trez.wtf
+
+      - name: Login to registries
+        uses: docker/login-action@v3
+        with:
+          registry-auth: |
+            - username: ${{ secrets.DOCKERHUB_USER }}
+              password: ${{ secrets.DOCKERHUB_PASSWORD }}
+            - registry: ghcr.io
+              username: ${{ secrets.GHCR_USER }}
+              password: ${{ secrets.GITHUB_LOGIN_TOKEN }}
+            - registry: git.trez.wtf
+              username: ${{ secrets.BOT_GITEA_USER }}
+              password: ${{ secrets.BOT_GITEA_PASSWORD }}
 
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
diff --git a/.gitea/workflows/renovate-pr-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml
index 58ecbd58..4d15218f 100644
--- a/.gitea/workflows/renovate-pr-deploy.yml
+++ b/.gitea/workflows/renovate-pr-deploy.yml
@@ -98,6 +98,19 @@ jobs:
           notification_title: "GITEA: [RENOVATE] Docker Compose Deployment @ Rinoa"
           notification_message: "Starting Docker Compose run..."
 
+      - name: Login to registries
+        uses: docker/login-action@v3
+        with:
+          registry-auth: |
+            - username: ${{ secrets.DOCKERHUB_USER }}
+              password: ${{ secrets.DOCKERHUB_PASSWORD }}
+            - registry: ghcr.io
+              username: ${{ secrets.GHCR_USER }}
+              password: ${{ secrets.GITHUB_LOGIN_TOKEN }}
+            - registry: git.trez.wtf
+              username: ${{ secrets.BOT_GITEA_USER }}
+              password: ${{ secrets.BOT_GITEA_PASSWORD }}
+
       - name: Docker Compose Deployment
         uses: hoverkraft-tech/compose-action@40041ff1b97dbf152cd2361138c2b03fa29139df # v2.3.0
         env: