diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0deeee3..4de2d23 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Build
         run: go build -o bin/jobloader-${{ matrix.os }}-${{ matrix.arch }} -ldflags \
-          "-X github.com/brandond/jobloader/pkg/version/GitVersion=${{ github.ref_name }} -X github.com/brandond/jobloader/pkg/version/GitVersion=${{ github.sha }}"
+          "-X github.com/brandond/jobloader/pkg/version/GitVersion=${{ github.ref_type == 'tag' && github.ref_name || 'dev' }} -X github.com/brandond/jobloader/pkg/version/GitCommit=${{ github.sha }}"
         env:
           GOOS: ${{ matrix.os }}
           GOARCH: ${{ matrix.arch }}
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index ffa0193..7935ace 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -27,7 +27,7 @@ jobs:
 
       - name: Build
         run: go build -o bin/jobloader-${{ matrix.os }}-${{ matrix.arch }} -ldflags \
-          "-X github.com/brandond/jobloader/pkg/version/GitVersion=${{ github.ref_name }} -X github.com/brandond/jobloader/pkg/version/GitVersion=${{ github.sha }}"
+          "-X github.com/brandond/jobloader/pkg/version/GitVersion=${{ github.ref_type == 'tag' && github.ref_name || 'dev' }} -X github.com/brandond/jobloader/pkg/version/GitCommit=${{ github.sha }}"
         env:
           GOOS: ${{ matrix.os }}
           GOARCH: ${{ matrix.arch }}