diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 496fda81a57f778cec47334f59d97d9040ea0ef9..ad5b967399f0aaf6394822753e16bd14b1d15983 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
 default:
   tags: [global, shared]
   interruptible: true
-  tags: [global, shared]
 
 stages:
   - prepare
diff --git a/.gitlab/ci/api.yml b/.gitlab/ci/api.yml
index 843aa336bcbda7d988e0d10011f43fb731ec9c65..db0adf8388c264697ae28c81d7df5d5ee48cf7f3 100644
--- a/.gitlab/ci/api.yml
+++ b/.gitlab/ci/api.yml
@@ -20,7 +20,9 @@ api/test/integration:
     - name: postgis/postgis:16-3.4
       alias: postgres
   stage: test
-  script: make test/api-integration
+  script:
+    - ./.gitlab/wait-for-it.sh -h ${PGHOST} -p ${PGPORT} -t 30 -- echo 'done'
+    - make test/api-integration
 api/type:
   extends: .prepare-node-run
   stage: test
diff --git a/packages/api/vitest.integration.config.ts b/packages/api/vitest.integration.config.ts
index ca1804da6d8746d744d0dc29d986c4e4abd8d3ae..144ea9041316691089efcac9655c31a0f310a230 100644
--- a/packages/api/vitest.integration.config.ts
+++ b/packages/api/vitest.integration.config.ts
@@ -13,7 +13,7 @@ export default defineConfig({
     },
     setupFiles: path.resolve(__dirname, './tests/vitestSetup.ts'),
     testTimeout: 10000,
-    hookTimeout: 30000,
+    hookTimeout: 45000,
     env: testEnv,
   },
 })