diff --git a/.gitea/workflows/tests.yml b/.gitea/workflows/tests.yml
index b11cc6a..aa4bcdd 100644
--- a/.gitea/workflows/tests.yml
+++ b/.gitea/workflows/tests.yml
@@ -38,7 +38,7 @@ jobs:
           echo "Starting Support Containers"
           docker run --rm \
             --network "${{ env.JOB_CONTAINER_NAME }}-DatabaseMigrations-network" \
-            --name ${{ env.RUN_ID }}-postgres \
+            --name ${{ gitea.run_id }}-postgres \
             -e POSTGRES_USER=postgres \
             -e POSTGRES_PASSWORD=postgres \
             -e POSTGRES_DB=postgres \
@@ -48,17 +48,17 @@ jobs:
       - name: Run Migrations
         run: |
           docker run \
-          --name ${{ env.RUN_ID }}-migrate \
+          --name ${{ gitea.run_id }}-migrate \
           --rm \
           --volumes-from ${{ env.JOB_CONTAINER_NAME }} \
           --network "${{ env.JOB_CONTAINER_NAME }}-DatabaseMigrations-network" \
           -w ${{ github.workspace }} \
-          siteworxpro/migrate:v4.18.3 -database "postgres://postgres:postgres@${{ env.RUN_ID }}-postgres:5432/postgres?sslmode=disable" -path db/migrations up
+          siteworxpro/migrate:v4.18.3 -database "postgres://postgres:postgres@${{ gitea.run_id }}-postgres:5432/postgres?sslmode=disable" -path db/migrations up
 
       - name: Rollback Migrations
         run: |
           docker run \
-          --name ${{ env.RUN_ID }}-migrate \
+          --name ${{ gitea.run_id }}-migrate \
           --rm \
           --volumes-from ${{ env.JOB_CONTAINER_NAME }} \
           --network "${{ env.JOB_CONTAINER_NAME }}-DatabaseMigrations-network" \