diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35d60aa1..92a96e83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -776,6 +776,7 @@ jobs:
             BRANCH_TAG: ${{ (startsWith(github.ref, 'refs/tags/v') && !endsWith(github.ref, '-rc') && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
 
             DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+            DOCKERHUB_USERNAME: ${{ vars.DOCKER_USERNAME }}
             GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
             GHCR_ENABLED: "${{ (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false) && 'true' || 'false' }}"
         steps:
@@ -816,7 +817,7 @@ jobs:
             - name: Load and push amd64 haswell image
               run: |
                   docker load -i oci-image-amd64-haswell-optimised.tar.gz
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell
                     docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell
                   fi
@@ -832,7 +833,7 @@ jobs:
             - name: Load and push amd64 image
               run: |
                   docker load -i oci-image-amd64.tar.gz
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64
                     docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64
                   fi
@@ -848,7 +849,7 @@ jobs:
             - name: Load and push arm64 image
               run: |
                   docker load -i oci-image-arm64v8.tar.gz
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8
                     docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8
                   fi
@@ -864,7 +865,7 @@ jobs:
             - name: Load and push amd64 debug image
               run: |
                   docker load -i oci-image-amd64-debug.tar.gz
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug
                     docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug
                   fi
@@ -880,7 +881,7 @@ jobs:
             - name: Load and push arm64 debug image
               run: |
                   docker load -i oci-image-arm64v8-debug.tar.gz
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug
                     docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug
                   fi
@@ -896,7 +897,7 @@ jobs:
             - name: Create Docker haswell manifests
               run: |
                   # Dockerhub Container Registry
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     docker manifest create ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell
                     docker manifest create ${DOCKER_HUB_REPO}:${BRANCH_TAG}-haswell --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell
                   fi
@@ -914,7 +915,7 @@ jobs:
             - name: Create Docker combined manifests
               run: |
                   # Dockerhub Container Registry
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     docker manifest create ${DOCKER_HUB_REPO}:${UNIQUE_TAG} --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8 --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64
                     docker manifest create ${DOCKER_HUB_REPO}:${BRANCH_TAG} --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8 --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64
                   fi
@@ -932,7 +933,7 @@ jobs:
             - name: Create Docker combined debug manifests
               run: |
                   # Dockerhub Container Registry
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     docker manifest create ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug
                     docker manifest create ${DOCKER_HUB_REPO}:${BRANCH_TAG}-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug
                   fi
@@ -949,7 +950,7 @@ jobs:
 
             - name: Push manifests to Docker registries
               run: |
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     docker manifest push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}
                     docker manifest push ${DOCKER_HUB_REPO}:${BRANCH_TAG}
                     docker manifest push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-debug
@@ -976,7 +977,7 @@ jobs:
 
             - name: Add Image Links to Job Summary
               run: |
-                  if [ ! -z $DOCKERHUB_TOKEN ]; then
+                  if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
                     echo "- \`docker pull ${DOCKER_HUB_REPO}:${UNIQUE_TAG}\`" >> $GITHUB_STEP_SUMMARY
                     echo "- \`docker pull ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-debug\`" >> $GITHUB_STEP_SUMMARY
                     echo "- \`docker pull ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell\`" >> $GITHUB_STEP_SUMMARY