diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 00000000..c18b212a
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,29 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '41 15 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue has had 60 days of inactivity & will close within 7 days'
+        stale-pr-message: 'This PR has had 60 days of inactivity & will close within 7 days'
+        close-issue-label: 'Stale Closed'
+        close-pr-label: 'Stale Closed'
+        exempt-issue-labels: 'Suggestion'
+        exempt-pr-labels: 'Suggestion'
diff --git a/client/evidence.lua b/client/evidence.lua
index a21d3d99..a73c5498 100644
--- a/client/evidence.lua
+++ b/client/evidence.lua
@@ -39,11 +39,11 @@ local function DrawText3D(x, y, z, text)
     SetTextFont(4)
     SetTextProportional(1)
     SetTextColour(255, 255, 255, 215)
-    SetTextEntry('STRING')
+    BeginTextCommandDisplayText('STRING')
     SetTextCentre(true)
-    AddTextComponentString(text)
+    AddTextComponentSubstringPlayerName(text)
     SetDrawOrigin(x,y,z, 0)
-    DrawText(0.0, 0.0)
+    EndTextCommandDisplayText(0.0, 0.0)
     local factor = (string.len(text)) / 370
     DrawRect(0.0, 0.0+0.0125, 0.017+ factor, 0.03, 0, 0, 0, 75)
     ClearDrawOrigin()
@@ -183,7 +183,7 @@ RegisterNetEvent('evidence:client:ClearCasingsInArea', function()
             end
             TriggerServerEvent('evidence:server:ClearCasings', casingList)
             QBCore.Functions.Notify(Lang:t("success.bullet_casing_removed"), "success")
-            
+
         end
     end, function() -- Cancel
         QBCore.Functions.Notify(Lang:t("error.bullet_casing_not_removed"), "error")
diff --git a/client/main.lua b/client/main.lua
index 66224161..c749985e 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -27,7 +27,7 @@ local function CreateDutyBlips(playerId, playerLabel, playerJob, playerLocation)
         end
         SetBlipAsShortRange(blip, true)
         BeginTextCommandSetBlipName('STRING')
-        AddTextComponentString(playerLabel)
+        AddTextComponentSubstringPlayerName(playerLabel)
         EndTextCommandSetBlipName(blip)
         DutyBlips[#DutyBlips+1] = blip
     end
@@ -172,7 +172,7 @@ RegisterNetEvent('police:client:policeAlert', function(coords, text)
     SetBlipAsShortRange(blip2, false)
     PulseBlip(blip2)
     BeginTextCommandSetBlipName('STRING')
-    AddTextComponentString(blipText)
+    AddTextComponentSubstringPlayerName(blipText)
     EndTextCommandSetBlipName(blip)
     while transG ~= 0 do
         Wait(180 * 4)
@@ -210,7 +210,7 @@ CreateThread(function()
         SetBlipScale(blip, 0.8)
         SetBlipColour(blip, 29)
         BeginTextCommandSetBlipName("STRING")
-        AddTextComponentString(station.label)
+        AddTextComponentSubstringPlayerName(station.label)
         EndTextCommandSetBlipName(blip)
     end
 end)
diff --git a/client/objects.lua b/client/objects.lua
index ac2ece03..7faa5763 100644
--- a/client/objects.lua
+++ b/client/objects.lua
@@ -48,11 +48,11 @@ local function DrawText3D(x, y, z, text)
     SetTextFont(4)
     SetTextProportional(1)
     SetTextColour(255, 255, 255, 215)
-    SetTextEntry("STRING")
+    BeginTextCommandDisplayText("STRING")
     SetTextCentre(true)
-    AddTextComponentString(text)
+    AddTextComponentSubstringPlayerName(text)
     SetDrawOrigin(x,y,z, 0)
-    DrawText(0.0, 0.0)
+    EndTextCommandDisplayText(0.0, 0.0)
     local factor = (string.len(text)) / 370
     DrawRect(0.0, 0.0+0.0125, 0.017+ factor, 0.03, 0, 0, 0, 75)
     ClearDrawOrigin()
diff --git a/client/tracker.lua b/client/tracker.lua
index 1cbd70c2..71ab566b 100644
--- a/client/tracker.lua
+++ b/client/tracker.lua
@@ -44,7 +44,7 @@ RegisterNetEvent('police:client:TrackerMessage', function(msg, coords)
     SetBlipAlpha(blip, transG)
     SetBlipScale(blip, 1.0)
     BeginTextCommandSetBlipName('STRING')
-    AddTextComponentString(Lang:t('info.ankle_location'))
+    AddTextComponentSubstringPlayerName(Lang:t('info.ankle_location'))
     EndTextCommandSetBlipName(blip)
     while transG ~= 0 do
         Wait(180 * 4)