diff --git a/docs/src/main/asciidoc/_project-features-stubrunner.adoc b/docs/src/main/asciidoc/_project-features-stubrunner.adoc
index 88b956f8fc..ae3e5a5a13 100644
--- a/docs/src/main/asciidoc/_project-features-stubrunner.adoc
+++ b/docs/src/main/asciidoc/_project-features-stubrunner.adoc
@@ -624,7 +624,7 @@ You can check out the https://github.com/spring-cloud/spring-cloud-pipelines[Spr
 project for more information.
 
 [[features-stub-runner-boot-server]]
-===== Stub Runner Server
+==== Stub Runner Server
 
 To use the Stub Runner Server, add the following dependency:
 
@@ -640,7 +640,7 @@ Then annotate a class with `@EnableStubRunnerServer`, build a fat jar, and it is
 For the properties, see the <<features-stub-runner-rule-spring,Stub Runner Spring>> section.
 
 [[features-stub-runner-boot-how-fat-jar]]
-===== Stub Runner Server Fat Jar
+==== Stub Runner Server Fat Jar
 
 You can download a standalone JAR from Maven (for example, for version 2.0.1.RELEASE)
 by running the following commands:
@@ -654,7 +654,7 @@ $ java -jar stub-runner.jar --stubrunner.ids=... --stubrunner.repositoryRoot=...
 ====
 
 [[features-stub-runner-boot-how-cli]]
-===== Spring Cloud CLI
+==== Spring Cloud CLI
 
 Starting from the `1.4.0.RELEASE` version of the https://cloud.spring.io/spring-cloud-cli[Spring Cloud CLI]
 project, you can start Stub Runner Boot by running `spring cloud stubrunner`.
@@ -905,7 +905,7 @@ stubsMode = StubRunnerProperties.StubsMode.REMOTE,
 Contracts and stubs may be stored in a location, where each producer has its own, dedicated folder for contracts and stub mappings. Under that folder each consumer can have its own setup. To make Stub Runner find the dedicated folder from the provided ids one can pass a property `stubs.find-producer=true` or a system property `stubrunner.stubs.find-producer=true` .
 
 [source,bash,indent=0]
-====
+----
 └── com.example <1>
     ├── some-artifact-id <2>
     │   └── 0.0.1
@@ -919,7 +919,7 @@ Contracts and stubs may be stored in a location, where each producer has its own
         └── mappings
             └── shouldReturnStuffForOtherArtifactId.json
 
-====
+----
 <1> group id of the consumers
 <2> consumer with artifact id [some-artifact-id]
 <3> contracts for the consumer with artifact id [some-artifact-id]
diff --git a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_docs_examples.java b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_docs_examples.java
index 7213f08f32..c0bc3d79ab 100644
--- a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_docs_examples.java
+++ b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_docs_examples.java
@@ -22,6 +22,7 @@ import java.util.function.Supplier;
 import org.springframework.cloud.contract.spec.Contract;
 import org.springframework.cloud.contract.verifier.util.ContractVerifierUtil;
 
+// tag::class[]
 class contract_docs_examples implements Supplier<Collection<Contract>> {
 
 	org.springframework.cloud.contract.spec.Contract httpDsl =
diff --git a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_multipart.java b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_multipart.java
index f3985893dd..91364d198f 100644
--- a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_multipart.java
+++ b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_multipart.java
@@ -26,6 +26,7 @@ import org.springframework.cloud.contract.spec.internal.DslProperty;
 import org.springframework.cloud.contract.spec.internal.Request;
 import org.springframework.cloud.contract.verifier.util.ContractVerifierUtil;
 
+// tag::class[]
 class contract_multipart implements Supplier<Collection<Contract>> {
 
 	private static Map<String, DslProperty> namedProps(Request r) {
diff --git a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest.java b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest.java
index a9745656b2..79ec6ffb8e 100644
--- a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest.java
+++ b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest.java
@@ -22,6 +22,7 @@ import java.util.function.Supplier;
 import org.springframework.cloud.contract.spec.Contract;
 import org.springframework.cloud.contract.verifier.util.ContractVerifierUtil;
 
+// tag::class[]
 class contract_rest implements Supplier<Collection<Contract>> {
 
 	@Override
diff --git a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest_from_file.java b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest_from_file.java
index addea24703..15000f82e5 100644
--- a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest_from_file.java
+++ b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest_from_file.java
@@ -21,6 +21,7 @@ import java.util.function.Supplier;
 
 import org.springframework.cloud.contract.spec.Contract;
 
+// tag::class[]
 class contract_rest_from_file implements Supplier<Collection<Contract>> {
 
 	@Override
diff --git a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest_with_tags.java b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest_with_tags.java
index 6d975f113a..8fdd1c75b3 100644
--- a/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest_with_tags.java
+++ b/spring-cloud-contract-verifier/src/test/resources/contractsToCompile/contract_rest_with_tags.java
@@ -22,6 +22,7 @@ import java.util.function.Supplier;
 import org.springframework.cloud.contract.spec.Contract;
 import org.springframework.cloud.contract.verifier.util.ContractVerifierUtil;
 
+// tag::class[]
 class contract_rest_with_tags implements Supplier<Collection<Contract>> {
 
 	static Object description = Collections.singletonList(