diff --git a/.gitea/workflows/build_and_push.yaml b/.gitea/workflows/build_and_push.yaml
index 4ae029d..2b50f49 100644
--- a/.gitea/workflows/build_and_push.yaml
+++ b/.gitea/workflows/build_and_push.yaml
@@ -6,11 +6,24 @@ on:
       - main
 
 jobs:
-  tests:
-    uses: ./.gitea/workflows/test.yaml
   build:
-    needs: [tests]
     runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:17-alpine
+
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_USER: postgres
+          POSTGRES_DB: postgres
+
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -25,6 +38,16 @@ jobs:
       - name: Install dependencies
         run: bun install
 
+      - name: Push Database - Test
+        run: bun run db:push
+        env:
+          POSTGRES_URL: postgres://postgres:postgres@postgres:5432/postgres
+      
+      - name: Test API
+        run: bun test:api
+        env:
+          POSTGRES_URL: postgres://postgres:postgres@postgres:5432/postgres
+
       - name: Build
         run: bun run build
         env:
diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
deleted file mode 100644
index bae149a..0000000
--- a/.gitea/workflows/test.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Test
-run-name: ${{ gitea.actor }}
-on: [workflow_call]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:17-alpine
-
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_USER: postgres
-          POSTGRES_DB: postgres
-
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Use Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: 1.1.29
-
-      - name: Install dependencies
-        run: bun install
-
-      - name: Push Database
-        run: bun run db:push
-        env:
-          POSTGRES_URL: postgres://postgres:postgres@postgres:5432/postgres
-      
-      - name: Test API
-        run: bun test:api
-        env:
-          POSTGRES_URL: postgres://postgres:postgres@postgres:5432/postgres
\ No newline at end of file