diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 225a46ab..0a4d4e4b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/dispatcharr:${{ github.ref == 'refs/heads/main' && 'latest' || 'dev' }}
-            ghcr.io/${{ github.repository_owner }}/dispatcharr:${{ steps.version.outputs.version }}-${{ steps.version.outputs.build }}
-            ghcr.io/${{ github.repository_owner }}/dispatcharr:${{ steps.version.outputs.sha_short }}
+            ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:${{ github.ref == 'refs/heads/main' && 'latest' || 'dev' }}
+            ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:${{ steps.version.outputs.version }}-${{ steps.version.outputs.build }}
+            ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:${{ steps.version.outputs.sha_short }}
           file: ./docker/Dockerfile
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8b7ca293..946740c4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,8 +46,8 @@ jobs:
           context: .
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/dispatcharr:latest
-            ghcr.io/${{ github.repository_owner }}/dispatcharr:${{ steps.update_version.outputs.new_version }}
+            ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:latest
+            ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:${{ steps.update_version.outputs.new_version }}
           file: ./docker/Dockerfile
 
       - name: Create GitHub Release
diff --git a/docker/build-dev.sh b/docker/build-dev.sh
index 6dfbf0bc..a56eb3a7 100755
--- a/docker/build-dev.sh
+++ b/docker/build-dev.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 # Get version information
 VERSION=$(python -c "import sys; sys.path.append('..'); import version; print(version.__version__)")
 BUILD=$(python -c "import sys; sys.path.append('..'); import version; print(version.__build__)")
@@ -9,3 +8,4 @@ docker build --build-arg BRANCH=dev \
   -t dispatcharr/dispatcharr:dev \
   -t dispatcharr/dispatcharr:${VERSION}-${BUILD} \
   -f Dockerfile ..
+.