diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61c2d040e59ca471a800818e8916ace71de24bbc..60880514a97c759997bf1023a715a8b157498544 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,6 +124,7 @@ test-frontend:
 
 test-default-deployment:
   stage: test-deployment
+  timeout: 5m
   needs:
     - test-frontend
   script:
@@ -135,6 +136,7 @@ test-default-deployment:
 
 test-env-deployment:
   stage: test-deployment
+  timeout: 5m
   needs:
     - test-frontend
   script:
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
index 20aadf3a08e66db1846bd8bf37357b0fd0a3de93..5fd4fdf02b04b37fe8f913c7e2fa85a7b34fcef2 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -190,7 +190,7 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
 
 
         /* test */
-        MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), mariaDBContainer.getMappedPort(3306), database.getInternalName(), USER_1_USERNAME, USER_1_PASSWORD);
+        MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), 3308, database.getInternalName(), USER_1_USERNAME, USER_1_PASSWORD);
     }
 
     @Test
@@ -224,14 +224,14 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
 
         /* test */
         assertThrows(SQLInvalidAuthorizationSpecException.class, () -> {
-            MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), mariaDBContainer.getMappedPort(3306), USER_3_USERNAME, USER_4_PASSWORD);
+            MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), 3308, USER_3_USERNAME, USER_4_PASSWORD);
         });
         databaseService.updatePassword(User.builder()
                 .id(USER_3_ID)
                 .username(USER_3_USERNAME)
                 .mariadbPassword(USER_4_DATABASE_PASSWORD)
                 .build());
-        MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), mariaDBContainer.getMappedPort(3306), USER_3_USERNAME, USER_4_PASSWORD);
+        MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), 3308, USER_3_USERNAME, USER_4_PASSWORD);
     }
 
     @Test