diff --git a/.github/workflows/build_keyboard.yml b/.github/workflows/build_keyboard.yml
index ec58ddb4..332c448e 100644
--- a/.github/workflows/build_keyboard.yml
+++ b/.github/workflows/build_keyboard.yml
@@ -33,6 +33,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Fetch all
+        run: git fetch
+
       - name: Prepare Submodules
         run: git -c submodule."qmk_porting/keyboards_private".update=none submodule update --recursive --init
 
@@ -49,7 +52,7 @@ jobs:
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all --
 
       - name: Get git version
-        run: echo "git_ver=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        run: echo "git_ver=$(git describe --always --dirty)" >> $GITHUB_ENV
 
       - name: UF2 Firmware (${{inputs.keyboard}})
         uses: actions/upload-artifact@v3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ce8d3ec..66e6ff1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ endif()
 
 execute_process(COMMAND git describe --always --dirty
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-    TIMEOUT 5
+    TIMEOUT 10
     OUTPUT_VARIABLE GIT_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )