diff --git a/pom.xml b/pom.xml
index efabf308..2c357622 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,8 @@
         <springdata.commons>3.0.13-SNAPSHOT</springdata.commons>
         <java-module-name>spring.data.couchbase</java-module-name>
         <hibernate.validator>7.0.1.Final</hibernate.validator>
+        <apt>1.1.3</apt>
+        <querydsl>5.0.0</querydsl>
         <mysema.querydsl>3.7.4</mysema.querydsl>
         <couchbase.encryption>3.1.0</couchbase.encryption>
         <jodatime>2.10.13</jodatime>
@@ -247,37 +249,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.querydsl</groupId>
-                        <artifactId>querydsl-apt</artifactId>
-                        <version>${querydsl}</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <proc>none</proc>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>test-annotation-processing</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                        <configuration>
-                            <proc>only</proc>
-                            <annotationProcessors>
-                                <annotationProcessor>org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor</annotationProcessor>
-                            </annotationProcessors>
-                            <generatedTestSourcesDirectory>target/generated-test-sources</generatedTestSourcesDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -321,6 +292,30 @@
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>com.mysema.maven</groupId>
+                <artifactId>apt-maven-plugin</artifactId>
+                <version>${apt}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.querydsl</groupId>
+                        <artifactId>querydsl-apt</artifactId>
+                        <version>${querydsl}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>test-process</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/generated-test-sources</outputDirectory>
+                            <processor>org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor</processor>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/asciidoc/repository.adoc b/src/main/asciidoc/repository.adoc
index b774de35..5e3471e3 100644
--- a/src/main/asciidoc/repository.adoc
+++ b/src/main/asciidoc/repository.adoc
@@ -30,51 +30,6 @@ public class Config extends AbstractCouchbaseConfiguration {
 
 An advanced usage is described in <<couchbase.repository.multibucket>>.
 
-[[couchbase.repository.configuration.dsl]]
-=== QueryDSL Configuration
-Spring Data Couchbase supports QueryDSL for building type-safe queries. To enable code generation you need to set `spring-data-couchbase` as annotation processor on your project.
-
-.Maven Configuration Example
-====
-[source,xml]
-----
-<build>
-    <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>[compiler-plugin-version]</version>
-            <configuration>
-                <annotationProcessorPaths>
-                    <!-- path to the annotation processor -->
-                    <path>
-                        <groupId>com.querydsl</groupId>
-                        <artifactId>querydsl-apt</artifactId>
-                        <version>[version]</version>
-                    </path>
-                    <path>
-                        <groupId>org.springframework.data</groupId>
-                        <artifactId>spring-data-couchbase</artifactId>
-                        <version>[version]</version>
-                    </path>
-                </annotationProcessorPaths>
-            </configuration>
-        </plugin>
-    </plugins>
-</build>
-
-----
-====
-
-.Gradle Configuration Example
-====
-[source,groovy]
-----
-annotationProcessor 'com.querydsl:querydsl-apt:${querydslVersion}'
-annotationProcessor 'org.springframework.data:spring-data-couchbase:${springDataCouchbaseVersion}'
-----
-====
-
 [[couchbase.repository.usage]]
 == Usage
 
diff --git a/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/src/main/resources/META-INF/services/javax.annotation.processing.Processor
deleted file mode 100644
index 616ab13f..00000000
--- a/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor
\ No newline at end of file