diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index db847f570..1487b1f3d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -147,6 +147,8 @@ jobs:
 
       - name: Generate OpenAPI documentation
         run: ./gradlew :stirling-pdf:generateOpenApiDocs
+        env:
+          DISABLE_ADDITIONAL_FEATURES: true
       
       - name: Upload OpenAPI Documentation
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtService.java
index 7ebef867f..f035e1385 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtService.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtService.java
@@ -204,7 +204,7 @@ public class JwtService implements JwtServiceInterface {
                 ResponseCookie.from(JWT_COOKIE_NAME, Newlines.stripAll(token))
                         .httpOnly(true)
                         .secure(true)
-                        .sameSite("None")
+                        .sameSite("Strict")
                         .maxAge(EXPIRATION / 1000)
                         .path("/")
                         .build();
diff --git a/exampleYmlFiles/test_cicd.yml b/exampleYmlFiles/test_cicd.yml
index 31e24da48..086f862d5 100644
--- a/exampleYmlFiles/test_cicd.yml
+++ b/exampleYmlFiles/test_cicd.yml
@@ -20,6 +20,7 @@ services:
     environment:
       DISABLE_ADDITIONAL_FEATURES: "false"
       SECURITY_ENABLELOGIN: "true"
+      V2: "false"
       PUID: 1002
       PGID: 1002
       UMASK: "022"