diff --git a/pom.xml b/pom.xml
index cdaeb55df..b25d3752a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -518,16 +518,6 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-checkstyle-plugin</artifactId>
 					<version>${maven-checkstyle-plugin.version}</version>
-					<configuration>
-						<excludes>**/module-info.java</excludes>
-						<includeTestSourceDirectory>true</includeTestSourceDirectory>
-						<configLocation>etc/checkstyle/config.xml</configLocation>
-						<suppressionsLocation>etc/checkstyle/suppressions.xml</suppressionsLocation>
-						<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-						<consoleOutput>true</consoleOutput>
-						<failsOnError>true</failsOnError>
-						<includeTestSourceDirectory>true</includeTestSourceDirectory>
-					</configuration>
 					<dependencies>
 						<dependency>
 							<groupId>com.puppycrawl.tools</groupId>
@@ -608,6 +598,16 @@
 						</goals>
 						<phase>validate</phase>
 						<inherited>true</inherited>
+						<configuration combine.self="override">
+							<excludes>**/module-info.java</excludes>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<configLocation>etc/checkstyle/config.xml</configLocation>
+							<suppressionsLocation>etc/checkstyle/suppressions.xml</suppressionsLocation>
+							<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+							<consoleOutput>true</consoleOutput>
+							<failsOnError>true</failsOnError>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/src/main/antora/modules/ROOT/images/movie-graph-deep.png b/src/main/antora/modules/ROOT/images/movie-graph-deep.png
index 8390da20a..54cec8db8 100644
Binary files a/src/main/antora/modules/ROOT/images/movie-graph-deep.png and b/src/main/antora/modules/ROOT/images/movie-graph-deep.png differ
diff --git a/src/main/antora/modules/ROOT/pages/faq.adoc b/src/main/antora/modules/ROOT/pages/faq.adoc
index c017ca64a..f576a634b 100644
--- a/src/main/antora/modules/ROOT/pages/faq.adoc
+++ b/src/main/antora/modules/ROOT/pages/faq.adoc
@@ -1151,7 +1151,7 @@ but especially our own variant of it, the `CypherdslConditionExecutor`. Both xre
 the full queries we create for you. Thus, you will have the domain fully populated together with custom conditions.
 Of course, your conditions must work with what we generate. Find the names of the root node, the related nodes and more
 xref:appendix/custom-queries.adoc#custom-queries[here].
-* Use the http://neo4j-contrib.github.io/cypher-dsl/current/[Cypher-DSL] via the `CypherdslStatementExecutor` or the `ReactiveCypherdslStatementExecutor`.
+* Use the https://neo4j.github.io/cypher-dsl[Cypher-DSL] via the `CypherdslStatementExecutor` or the `ReactiveCypherdslStatementExecutor`.
 The Cypher-DSL is predestined to create dynamic queries. In the end, it's what SDN uses under the hood anyway. The corresponding
 mixins work both with the domain type of repository itself and with projections (something that the mixins for adding
 conditions don't).
diff --git a/src/main/antora/modules/ROOT/pages/repositories/sdn-extension.adoc b/src/main/antora/modules/ROOT/pages/repositories/sdn-extension.adoc
index c0600a9c6..9e7deed1f 100644
--- a/src/main/antora/modules/ROOT/pages/repositories/sdn-extension.adoc
+++ b/src/main/antora/modules/ROOT/pages/repositories/sdn-extension.adoc
@@ -29,7 +29,7 @@ Additional mixins provided are:
 Both the `QuerydslPredicateExecutor` and `CypherdslConditionExecutor` provide the same concept: SDN generates a query, you
 provide "predicates" (Query DSL) or "conditions" (Cypher DSL) that will be added. We recommend the Cypher DSL, as this is
 what SDN uses natively. You might even want to consider using the
-http://neo4j-contrib.github.io/cypher-dsl/2021.1.1/#thespringdataneo4j6annotationprocessor[annotation processor] that generates
+https://neo4j.github.io/cypher-dsl#thespringdataneo4j6annotationprocessor[annotation processor] that generates
 a static meta model for you.
 
 How does that work? Declare your repository as described above and add *one*  of the following interfaces: