diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 96964172d..728c38bc7 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -95,7 +95,9 @@ jobs:
 
           push_tags=""
           for tag in ${tags}; do
-            push_tags="${push_tags}${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}:${tag},"
+            if [ "${{ secrets.DOCKERHUB_USERNAME }}" == "" ]; then
+              push_tags="${push_tags}${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}:${tag},"
+            fi
             push_tags="${push_tags}ghcr.io/${{ github.repository_owner }}/${{ matrix.IMAGE }}:${tag},"
           done
           push_tags="${push_tags%,*}"
@@ -127,6 +129,7 @@ jobs:
 
       # login to registries
       - name: Login to DockerHub
+        if: secrets.DOCKERHUB_USERNAME != ""
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 780a934c8..2dc08709a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Send email to all admins in a single email when a user submits 'Request access' for a space
 - Send email to all admins and request user in a single email when any admin accepts/rejects 'Request access' for a space [#330](https://github.com/clowder-framework/clowder/issues/330)
+- github actions would fail for docker builds due to secrets not existing
 
 ## 1.20.3 - 2022-06-10