diff --git a/spring-graphql-docs/antora-playbook.yml b/spring-graphql-docs/antora-playbook.yml
index 6f4308ee..6d3617e8 100644
--- a/spring-graphql-docs/antora-playbook.yml
+++ b/spring-graphql-docs/antora-playbook.yml
@@ -5,8 +5,6 @@ antora:
     - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
     - '@antora/collector-extension'
     - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/tabs-migration-extension'
-      unwrap_example_block: always
     - require: '@springio/antora-extensions/root-component-extension'
       root_component_name: 'graphql'
 site:
diff --git a/spring-graphql-docs/modules/ROOT/pages/data.adoc b/spring-graphql-docs/modules/ROOT/pages/data.adoc
index 34a3c31f..b160d4b5 100644
--- a/spring-graphql-docs/modules/ROOT/pages/data.adoc
+++ b/spring-graphql-docs/modules/ROOT/pages/data.adoc
@@ -68,8 +68,11 @@ https://querydsl.com/static/querydsl/latest/reference/html/ch02.html[official re
 
 For example:
 
+[tabs]
+======
+Gradle::
++
 [source,groovy,indent=0,subs="verbatim,quotes,attributes",role="primary"]
-.Gradle
 ----
 dependencies {
 	//...
@@ -83,8 +86,10 @@ compileJava {
 	 options.annotationProcessorPath = configurations.annotationProcessor
 }
 ----
+
+Maven::
++
 [source,xml,indent=0,subs="verbatim,quotes,attributes",role="secondary"]
-.Maven
 ----
 <dependencies>
 	<!-- ... -->
@@ -126,6 +131,7 @@ compileJava {
 	</plugin>
 </plugins>
 ----
+======
 
 The {github-10x-branch}/samples/webmvc-http[webmvc-http] sample uses Querydsl for
 `artifactRepositories`.
diff --git a/spring-graphql-docs/modules/ROOT/pages/testing.adoc b/spring-graphql-docs/modules/ROOT/pages/testing.adoc
index c2ab5c03..7f541617 100644
--- a/spring-graphql-docs/modules/ROOT/pages/testing.adoc
+++ b/spring-graphql-docs/modules/ROOT/pages/testing.adoc
@@ -6,16 +6,21 @@ WebSocket, and RSocket, as well as for testing directly against a server.
 
 To make use of this, add `spring-graphql-test` to your build:
 
+[tabs]
+======
+Gradle::
++
 [source,groovy,indent=0,subs="verbatim,quotes,attributes",role="primary"]
-.Gradle
 ----
 dependencies {
 	// ...
 	testImplementation 'org.springframework.graphql:spring-graphql-test:{spring-graphql-version}'
 }
 ----
+
+Maven::
++
 [source,xml,indent=0,subs="verbatim,quotes,attributes",role="secondary"]
-.Maven
 ----
 <dependencies>
 	<!-- ... -->
@@ -27,6 +32,7 @@ dependencies {
 	</dependency>
 </dependencies>
 ----
+======