diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d06a294..2ec0d9f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,11 +21,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 1
+          fetch-depth: 0
+          fetch-tags: true
           persist-credentials: false
 
-      - run: git fetch --tags
-
       - name: Switch XCode Version
         uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
@@ -45,11 +44,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 1
+          fetch-depth: 0
+          fetch-tags: true
           persist-credentials: false
 
-      - run: git fetch --tags
-
       - name: Switch XCode Version
         uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
@@ -69,11 +67,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 1
+          fetch-depth: 0
+          fetch-tags: true
           persist-credentials: false
 
-      - run: git fetch --tags
-
       - name: Setup Nix
         uses: ./.github/actions/nix-devshell
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e8371068..4c2e8780 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,11 +17,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 1
+          fetch-depth: 0
+          fetch-tags: true
           persist-credentials: false
 
-      - run: git fetch --tags
-
       - name: Switch XCode Version
         uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
diff --git a/Makefile b/Makefile
index 9c1cc714..81fe6723 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,15 @@ XCPROJECT := Coder\ Desktop/Coder\ Desktop.xcodeproj
 SCHEME := Coder\ Desktop
 SWIFT_VERSION := 6.0
 
-MARKETING_VERSION=$(shell git describe --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$//')
 CURRENT_PROJECT_VERSION=$(shell git describe --tags)
+ifeq ($(strip $(CURRENT_PROJECT_VERSION)),)
+    $(error CURRENT_PROJECT_VERSION cannot be empty)
+endif
+
+MARKETING_VERSION=$(shell git describe --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$$//')
+ifeq ($(strip $(MARKETING_VERSION)),)
+    $(error MARKETING_VERSION cannot be empty)
+endif
 
 # Define the keychain file name first
 KEYCHAIN_FILE := app-signing.keychain-db