diff --git a/.github/ci/.github-actions-generator-state b/.github/ci/.github-actions-generator-state
index 1ca07871..bd3ab7f2 100644
--- a/.github/ci/.github-actions-generator-state
+++ b/.github/ci/.github-actions-generator-state
@@ -7,8 +7,8 @@ generator	49
 [outputs]
 .github/actionlint.yaml	ec35f48ae7e90e0e
 .github/ci/project.toml	b19da7b7165e2f66
-.github/workflows/ci-main.yml	7b55f4df4a234985
-.github/workflows/ci-policy.yml	a9a48676140ac8dd
+.github/workflows/ci-main.yml	9674edd8e9649bc5
+.github/workflows/ci-policy.yml	29d78b9957b5e17f
 .github/workflows/ci-pr.yml	aa0b4d40949af2ad
 .github/workflows/ci-unit-gradle.yml	a8a769d0f75f737d
 .github/workflows/maintenance.yml	44cdcd6db1e77d43
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 50105ae7..8ec21221 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -176,24 +176,13 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           DEFAULT_BRANCH: main
-          DECLARED_RULESET_CONTEXTS: DCO,Policy,ci-required
         run: |
           set -euo pipefail
-          stderr="$(mktemp)"
-          trap 'rm -f "$stderr"' EXIT
-          if contexts="$(gh api "repos/$GITHUB_REPOSITORY/rulesets?includes_parents=true" 2>"$stderr" \
+          contexts="$(gh api "repos/$GITHUB_REPOSITORY/rulesets?includes_parents=true" \
             | jq -r '.[] | select(.target == "branch" and .enforcement == "active") | .id' \
             | while read -r id; do gh api "repos/$GITHUB_REPOSITORY/rulesets/$id"; done \
             | jq -r --arg branch "refs/heads/$DEFAULT_BRANCH" 'select(.conditions.ref_name.include | any(. == "~DEFAULT_BRANCH" or . == "~ALL" or . == $branch)) | .rules[] | select(.type == "required_status_checks") | .parameters.required_status_checks[].context' \
-            | sort -u | paste -sd, -)"; then
-            :
-          elif grep -qE '(HTTP 403|Upgrade to GitHub Team)' "$stderr"; then
-            echo "::warning::rulesets API returned 403; falling back to declared contexts [$DECLARED_RULESET_CONTEXTS]"
-            contexts="$DECLARED_RULESET_CONTEXTS"
-          else
-            cat "$stderr" >&2
-            exit 1
-          fi
+            | sort -u | paste -sd, -)"
           echo "RULESET_CONTEXTS=$contexts" >> "$GITHUB_ENV"
       - name: Enforce workflow policy
         env:
diff --git a/.github/workflows/ci-policy.yml b/.github/workflows/ci-policy.yml
index 8d156121..c939ac8e 100644
--- a/.github/workflows/ci-policy.yml
+++ b/.github/workflows/ci-policy.yml
@@ -80,24 +80,13 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           DEFAULT_BRANCH: main
-          DECLARED_RULESET_CONTEXTS: DCO,Policy,ci-required
         run: |
           set -euo pipefail
-          stderr="$(mktemp)"
-          trap 'rm -f "$stderr"' EXIT
-          if contexts="$(gh api "repos/$GITHUB_REPOSITORY/rulesets?includes_parents=true" 2>"$stderr" \
+          contexts="$(gh api "repos/$GITHUB_REPOSITORY/rulesets?includes_parents=true" \
             | jq -r '.[] | select(.target == "branch" and .enforcement == "active") | .id' \
             | while read -r id; do gh api "repos/$GITHUB_REPOSITORY/rulesets/$id"; done \
             | jq -r --arg branch "refs/heads/$DEFAULT_BRANCH" 'select(.conditions.ref_name.include | any(. == "~DEFAULT_BRANCH" or . == "~ALL" or . == $branch)) | .rules[] | select(.type == "required_status_checks") | .parameters.required_status_checks[].context' \
-            | sort -u | paste -sd, -)"; then
-            :
-          elif grep -qE '(HTTP 403|Upgrade to GitHub Team)' "$stderr"; then
-            echo "::warning::rulesets API returned 403; falling back to declared contexts [$DECLARED_RULESET_CONTEXTS]"
-            contexts="$DECLARED_RULESET_CONTEXTS"
-          else
-            cat "$stderr" >&2
-            exit 1
-          fi
+            | sort -u | paste -sd, -)"
           echo "RULESET_CONTEXTS=$contexts" >> "$GITHUB_ENV"
       - name: Enforce workflow policy
         env:
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ad4096df..8afaf5dd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,17 +4,8 @@ kotest = "6.1.11"
 graphql-java = "26.0"
 graphql-kickstart-spring-boot = "15.1.0"
 commons-text = "1.15.0"
-<<<<<<< HEAD
 spring-boot = "4.0.6"
-=======
-<<<<<<< HEAD
-spring-boot = "3.5.14"
->>>>>>> origin/main
-dgs = "11.1.0"
-=======
-spring-boot = "3.5.13"
 dgs = "12.0.1"
->>>>>>> origin/main
 
 [libraries]
 # BOMs
diff --git a/graphql-datetime-spring-boot-autoconfigure/src/main/java/com/tailrocks/graphql/datetime/spring/boot/GraphQlDateTimeAutoConfiguration.java b/graphql-datetime-spring-boot-autoconfigure/src/main/java/com/tailrocks/graphql/datetime/spring/boot/GraphQlDateTimeAutoConfiguration.java
index cfc087c4..1b71afd2 100644
--- a/graphql-datetime-spring-boot-autoconfigure/src/main/java/com/tailrocks/graphql/datetime/spring/boot/GraphQlDateTimeAutoConfiguration.java
+++ b/graphql-datetime-spring-boot-autoconfigure/src/main/java/com/tailrocks/graphql/datetime/spring/boot/GraphQlDateTimeAutoConfiguration.java
@@ -24,7 +24,12 @@
 /**
  * @author Alexey Zhokhov
  */
-@AutoConfiguration(before = {org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration.class})
+@AutoConfiguration(
+        beforeName = {
+                "org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration",
+                "org.springframework.boot.graphql.autoconfigure.GraphQlAutoConfiguration"
+        }
+)
 @ConditionalOnClass({org.springframework.graphql.execution.RuntimeWiringConfigurer.class})
 public class GraphQlDateTimeAutoConfiguration {
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8ac175b7..982322f3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,10 +11,9 @@ include(
     "graphql-datetime-spring-boot-common",
     "graphql-datetime-spring-boot-starter",
     "graphql-java-datetime",
-
     // samples
     "samples:kickstart-webflux",
     "samples:kickstart-webmvc",
     "samples:spring-boot-webmvc",
-    "samples:dgs-webmvc"
+    "samples:dgs-webmvc",
 )