diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml
index 8402922..5bacc28 100644
--- a/.github/workflows/docker-build-main.yml
+++ b/.github/workflows/docker-build-main.yml
@@ -100,8 +100,6 @@ jobs:
         # Check the merged branch and set versions accordingly
         if [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == "test" ]]; then
           echo "Using test versions"
-          # Set test versions here
-          UNITY_BUILD_VERSION="test-version"
         elif [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == hotfix/* ]]; then
           echo "Incrementing patch version for hotfix"
           VERSION_PATCH=$((VERSION_PATCH + 1))
@@ -117,8 +115,13 @@ jobs:
       run: |
         git config user.name "GitHub Actions"
         git config user.email "github-actions@users.noreply.github.com"
-        git tag -a "${{steps.tag_selector.outputs.TAGNAME}}" -m "${{steps.tag_selector.outputs.TAGMSG}}"
-        git push origin "${{steps.tag_selector.outputs.TAGNAME}}"
+        if [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == "test" ]]; then
+          echo "Using test versions"
+        elif [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == hotfix/* ]]; then
+          echo "Push tag for hotfix"
+          git tag -a "${{steps.tag_selector.outputs.TAGNAME}}" -m "${{steps.tag_selector.outputs.TAGMSG}}"
+          git push origin "${{steps.tag_selector.outputs.TAGNAME}}"
+        fi
     outputs:
       TAGNAME: ${{steps.tag_selector.outputs.TAGNAME}}
       TAGMSG: ${{steps.tag_selector.outputs.TAGMSG}}
diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql
index 8191237..68ad91b 100644
--- a/applications/scripts/datafix-ab#001.sql
+++ b/applications/scripts/datafix-ab#001.sql
@@ -1 +1 @@
-test 8.5.1
\ No newline at end of file
+test 8.5.2
\ No newline at end of file