diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index a6812b4..c611227 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -72,7 +72,7 @@ jobs:
     steps:
       - name: Wait for server to be ready and healthy test
         run: |
-          sleep 20
+          sleep 30
           until curl -sSf http://localhost:${{ secrets.SERVER_LOCAL_PORT }}/actuator/health; do
             echo "Waiting for server..."
             sleep 5
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 31ad475..0973c5b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -36,6 +36,11 @@ spring.datasource.hikari.maximum-pool-size=5
 spring.datasource.hikari.minimum-idle=1
 spring.datasource.hikari.idle-timeout=300000
 
+# Default Pagination Settings
+spring.data.web.pageable.default-page-size=40
+spring.data.web.pageable.page-parameter=page
+spring.data.web.pageable.size-parameter=size
+
 # ===============================
 # = EMAIL CONFIGURATION
 # ===============================