diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e27640d..2097d724 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,11 +16,47 @@ jobs:
           java-version: 11
       - name: Build with Gradle
         run: ./gradlew build
+
+  integration-test:
+    name: "integration-test (Spring Boot version ${{ matrix.spring-boot-version }})"
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      matrix:
+        include:
+          - spring-boot-version: 2.5.+
+            experimental: false
+          - spring-boot-version: 2.6.+
+            experimental: false
+          - spring-boot-version: 2.+
+            experimental: true
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Run integration test
+        run: ./gradlew check -p integration-tests -PspringBootVersion=${{ matrix.spring-boot-version }}
+
+  publish:
+    needs:
+      - build
+      - integration-test
+    if: ${{ github.ref == 'refs/heads/main' || startswith(github.ref, 'refs/tags/') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
       - name: Publish
-        if: ${{ github.ref == 'refs/heads/main' || startswith(github.ref, 'refs/tags/') }}
         env:
           SIGNING_PRIVATE_KEY: ${{ secrets.MAVEN_CENTRAL_GPG_KEY }}
           SIGNING_PASSWORD: ${{ secrets.MAVEN_CENTRAL_GPG_PASSWORD }}
           ORG_GRADLE_PROJECT_sonatype_username: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
           ORG_GRADLE_PROJECT_sonatype_password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
-        run: ./gradlew publish
\ No newline at end of file
+        run: ./gradlew publish
diff --git a/contentcloud-spring-boot-autoconfigure/build.gradle b/contentcloud-spring-boot-autoconfigure/build.gradle
index a63654e6..7d76c333 100644
--- a/contentcloud-spring-boot-autoconfigure/build.gradle
+++ b/contentcloud-spring-boot-autoconfigure/build.gradle
@@ -1,17 +1,35 @@
 plugins {
     id 'java-library'
+    id 'maven-publish'
 }
 
-// apply from: "${rootDir}/gradle/publish.gradle"
-
 repositories {
     mavenCentral()
 }
 
+configurations {
+    compileOnly {
+        extendsFrom(annotationProcessor)
+    }
+
+    testAnnotationProcessor {
+        extendsFrom(annotationProcessor)
+    }
+}
+
 dependencies {
-    implementation platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
+    annotationProcessor platform(project(':contentcloud-spring-boot-platform'))
+    annotationProcessor 'org.projectlombok:lombok'
+
+    implementation platform(project(':contentcloud-spring-boot-platform'))
+    implementation 'org.springframework.boot:spring-boot-autoconfigure'
+
+    compileOnly "com.github.paulcwarren:spring-content-autoconfigure"
+    compileOnly "com.github.paulcwarren:spring-content-s3"
 
     testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'com.github.paulcwarren:spring-content-s3-boot-starter'
 }
 
 tasks.named('test') {
diff --git a/contentcloud-spring-boot-autoconfigure/src/main/java/eu/xenit/contentcloud/spring/autoconfigure/s3/S3RegionAutoConfiguration.java b/contentcloud-spring-boot-autoconfigure/src/main/java/eu/xenit/contentcloud/spring/autoconfigure/s3/S3RegionAutoConfiguration.java
new file mode 100644
index 00000000..cfd260f6
--- /dev/null
+++ b/contentcloud-spring-boot-autoconfigure/src/main/java/eu/xenit/contentcloud/spring/autoconfigure/s3/S3RegionAutoConfiguration.java
@@ -0,0 +1,82 @@
+package eu.xenit.contentcloud.spring.autoconfigure.s3;
+
+import internal.org.springframework.content.s3.boot.autoconfigure.S3ContentAutoConfiguration;
+import internal.org.springframework.content.s3.boot.autoconfigure.S3ContentAutoConfiguration.S3Properties;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import software.amazon.awssdk.services.s3.S3Client;
+
+@Configuration
+// @AutoConfigureAfter uses a string because the class may not be present on the classpath,
+// and we don't want an exception in that case
+@AutoConfigureBefore(name="internal.org.springframework.content.s3.boot.autoconfigure.S3ContentAutoConfiguration")
+@ConditionalOnClass({S3Client.class, S3ContentAutoConfiguration.class})
+@ConditionalOnProperty(
+        prefix="spring.content.storage.type",
+        name = "default",
+        havingValue = "s3",
+        matchIfMissing=true)
+public class S3RegionAutoConfiguration {
+    @Component
+    @ConfigurationProperties(prefix = "spring.content.s3")
+    @Data
+    public static class S3AdditionalProperties {
+        private String region;
+    }
+
+    /**
+     * This component will be registered (and created) before S3Client,
+     * and is thus able to set a property that is later picked up by the S3Client.
+     */
+    @Component
+    @RequiredArgsConstructor
+    static class S3RegionConfigurer implements InitializingBean, DisposableBean {
+        private final S3Properties s3Properties;
+        private final S3AdditionalProperties s3AdditionalProperties;
+
+        private final static Object AWS_REGION_SENTINEL = new Object();
+        private final static Object AWS_REGION_NON_EXISTENT = new Object();
+
+        private Object previousAwsRegionProperty = AWS_REGION_SENTINEL;
+
+        private void replaceRegion(String newRegion) {
+            if(previousAwsRegionProperty == AWS_REGION_SENTINEL) {
+                if(System.getProperties().contains("aws.region")) {
+                    previousAwsRegionProperty = System.getProperty("aws.region");
+                } else {
+                    previousAwsRegionProperty = AWS_REGION_NON_EXISTENT;
+                }
+
+            }
+            System.setProperty("aws.region", newRegion);
+        }
+
+        @Override
+        public void afterPropertiesSet() throws Exception {
+            if(StringUtils.hasText(s3AdditionalProperties.getRegion())) {
+                replaceRegion(s3AdditionalProperties.getRegion());
+            } else if(StringUtils.hasText(s3Properties.endpoint)) {
+                replaceRegion("none");
+            }
+        }
+
+        @Override
+        public void destroy() throws Exception {
+            if (AWS_REGION_NON_EXISTENT.equals(previousAwsRegionProperty)) {
+                System.getProperties().remove("aws.region");
+            } else if(previousAwsRegionProperty != AWS_REGION_SENTINEL) {
+                System.setProperty("aws.region", (String)previousAwsRegionProperty);
+            }
+
+        }
+    }
+}
diff --git a/contentcloud-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/contentcloud-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..7c7c822c
--- /dev/null
+++ b/contentcloud-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+eu.xenit.contentcloud.spring.autoconfigure.s3.S3RegionAutoConfiguration
\ No newline at end of file
diff --git a/contentcloud-spring-boot-autoconfigure/src/test/java/eu/xenit/contentcloud/spring/autoconfigure/s3/S3RegionAutoConfigurationTest.java b/contentcloud-spring-boot-autoconfigure/src/test/java/eu/xenit/contentcloud/spring/autoconfigure/s3/S3RegionAutoConfigurationTest.java
new file mode 100644
index 00000000..20acc731
--- /dev/null
+++ b/contentcloud-spring-boot-autoconfigure/src/test/java/eu/xenit/contentcloud/spring/autoconfigure/s3/S3RegionAutoConfigurationTest.java
@@ -0,0 +1,109 @@
+package eu.xenit.contentcloud.spring.autoconfigure.s3;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
+
+import java.util.Arrays;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.springframework.boot.autoconfigure.AutoConfigurationPackage;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.FilteredClassLoader;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.awscore.client.config.AwsClientOption;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+class S3RegionAutoConfigurationTest {
+
+    private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+            .withConfiguration(AutoConfigurations.of(S3RegionAutoConfiguration.class))
+            .withUserConfiguration(TestConfig.class);
+
+    @SneakyThrows
+    private static SdkClientConfiguration extractConfiguration(S3Client s3Client) {
+        Class<? extends S3Client> s3clazz = s3Client.getClass();
+        var sdkClientConfigField = Arrays.stream(s3clazz.getDeclaredFields())
+                .filter(field -> field.getType() == SdkClientConfiguration.class)
+                .findAny()
+                .get();
+
+        sdkClientConfigField.setAccessible(true);
+        return (SdkClientConfiguration) sdkClientConfigField.get(s3Client);
+    }
+
+    @Test
+    @ResourceLock(SYSTEM_PROPERTIES)
+    void setsRegionWhenConfiguredExplicitly() {
+        contextRunner
+                .withPropertyValues("spring.content.s3.region=my-region")
+                .run(context -> {
+                    S3Client client = context.getBean(S3Client.class);
+
+                    SdkClientConfiguration configuration = extractConfiguration(client);
+
+                    assertEquals(Region.of("my-region"), configuration.option(AwsClientOption.AWS_REGION));
+                });
+    }
+
+    @Test
+    @ResourceLock(SYSTEM_PROPERTIES)
+    void setsFakeRegionWhenConfiguredWithEndpoint() {
+        contextRunner
+                .withPropertyValues("spring.content.s3.endpoint=http://some-endpoint:1234/")
+                .run(context -> {
+                    S3Client client = context.getBean(S3Client.class);
+
+                    SdkClientConfiguration configuration = extractConfiguration(client);
+
+                    assertEquals(Region.of("none"), configuration.option(AwsClientOption.AWS_REGION));
+                });
+    }
+
+
+    @Test
+    @ResourceLock(SYSTEM_PROPERTIES)
+    void setsNoRegionWhenNotConfigured() {
+        contextRunner
+                .run(context -> {
+                    assertThat(context).getFailure().hasRootCauseInstanceOf(SdkClientException.class);
+                });
+    }
+
+    @Test
+    @ResourceLock(SYSTEM_PROPERTIES)
+    void setsNoRegionWhenS3NotOnClasspath() {
+        contextRunner
+                .withClassLoader(new FilteredClassLoader(S3Client.class))
+                .run(context -> {
+                    assertThat(context).hasNotFailed();
+                    assertThat(context).doesNotHaveBean(S3Client.class);
+                });
+    }
+
+    @Test
+    @ResourceLock(SYSTEM_PROPERTIES)
+    void setsNoRegionWhenS3NotEnabled() {
+        contextRunner
+                .withPropertyValues("spring.content.storage.type.default=fs")
+                .run(context -> {
+                    assertThat(context).hasNotFailed();
+                    assertThat(context).doesNotHaveBean(S3Client.class);
+                });
+    }
+
+
+    @Configuration
+    @EnableAutoConfiguration
+    @AutoConfigurationPackage
+    public static class TestConfig {
+
+    }
+
+}
\ No newline at end of file
diff --git a/contentcloud-spring-boot-starter/build.gradle b/contentcloud-spring-boot-starter/build.gradle
index b0e91df7..f9f2280d 100644
--- a/contentcloud-spring-boot-starter/build.gradle
+++ b/contentcloud-spring-boot-starter/build.gradle
@@ -21,6 +21,8 @@ dependencies {
 
     api 'com.querydsl:querydsl-jpa'
 
+    implementation project(':contentcloud-spring-boot-autoconfigure')
+
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'org.postgresql:postgresql'
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
new file mode 100644
index 00000000..e55a7da5
--- /dev/null
+++ b/integration-tests/build.gradle
@@ -0,0 +1,20 @@
+plugins {
+    id 'base'
+}
+
+import java.util.stream.Collectors;
+
+def integTestTasks(taskName) {
+    return gradle.includedBuilds.stream()
+            .filter(build -> build.name.startsWith('it-'))
+            .map(build -> build.task(taskName))
+            .collect(Collectors.toList())
+}
+
+check {
+    dependsOn(integTestTasks(':check'))
+}
+
+clean {
+    dependsOn(integTestTasks(':clean'))
+}
diff --git a/integration-tests/integration-tests-spring/.gitignore b/integration-tests/integration-tests-spring/.gitignore
new file mode 100644
index 00000000..63d2f1a0
--- /dev/null
+++ b/integration-tests/integration-tests-spring/.gitignore
@@ -0,0 +1,36 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
diff --git a/integration-tests/integration-tests-spring/build.gradle b/integration-tests/integration-tests-spring/build.gradle
new file mode 100644
index 00000000..0c282b90
--- /dev/null
+++ b/integration-tests/integration-tests-spring/build.gradle
@@ -0,0 +1,31 @@
+plugins {
+	id 'org.springframework.boot' version '2.6.2'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'java'
+}
+
+group = 'eu.xenit.contentcloud.userapps.holmes'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '11'
+
+configurations {
+	compileOnly {
+		extendsFrom annotationProcessor
+	}
+}
+
+repositories {
+	mavenCentral()
+	maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+}
+
+dependencies {
+	implementation 'eu.xenit.contentcloud.starter:contentcloud-spring-boot-starter:0.1.0-SNAPSHOT'
+	annotationProcessor 'eu.xenit.contentcloud.starter:contentcloud-spring-boot-starter-annotations:0.1.0-SNAPSHOT'
+	annotationProcessor 'org.projectlombok:lombok'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+test {
+	useJUnitPlatform()
+}
diff --git a/integration-tests/integration-tests-spring/gradle/wrapper/gradle-wrapper.jar b/integration-tests/integration-tests-spring/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..7454180f
Binary files /dev/null and b/integration-tests/integration-tests-spring/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/integration-tests/integration-tests-spring/gradle/wrapper/gradle-wrapper.properties b/integration-tests/integration-tests-spring/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..ffed3a25
--- /dev/null
+++ b/integration-tests/integration-tests-spring/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/integration-tests/integration-tests-spring/gradlew b/integration-tests/integration-tests-spring/gradlew
new file mode 100755
index 00000000..1b6c7873
--- /dev/null
+++ b/integration-tests/integration-tests-spring/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/integration-tests/integration-tests-spring/gradlew.bat b/integration-tests/integration-tests-spring/gradlew.bat
new file mode 100644
index 00000000..ac1b06f9
--- /dev/null
+++ b/integration-tests/integration-tests-spring/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/integration-tests/integration-tests-spring/settings.gradle b/integration-tests/integration-tests-spring/settings.gradle
new file mode 100644
index 00000000..ff8c04e4
--- /dev/null
+++ b/integration-tests/integration-tests-spring/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'dcm-api'
diff --git a/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/DcmApiApplication.java b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/DcmApiApplication.java
new file mode 100644
index 00000000..7eb6299d
--- /dev/null
+++ b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/DcmApiApplication.java
@@ -0,0 +1,13 @@
+package eu.xenit.contentcloud.userapps.holmes.dcm;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DcmApiApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(DcmApiApplication.class, args);
+	}
+
+}
diff --git a/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/model/Case.java b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/model/Case.java
new file mode 100644
index 00000000..c5f7fc67
--- /dev/null
+++ b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/model/Case.java
@@ -0,0 +1,25 @@
+package eu.xenit.contentcloud.userapps.holmes.dcm.model;
+
+import java.lang.String;
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@NoArgsConstructor
+@Getter
+@Setter
+public class Case {
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private UUID id;
+
+	private String name;
+
+	private String description;
+}
diff --git a/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/model/Person.java b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/model/Person.java
new file mode 100644
index 00000000..973f7a47
--- /dev/null
+++ b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/model/Person.java
@@ -0,0 +1,25 @@
+package eu.xenit.contentcloud.userapps.holmes.dcm.model;
+
+import java.lang.String;
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@NoArgsConstructor
+@Getter
+@Setter
+public class Person {
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private UUID id;
+
+	private String name;
+
+	private String notes;
+}
diff --git a/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/repository/CaseRepository.java b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/repository/CaseRepository.java
new file mode 100644
index 00000000..9584836d
--- /dev/null
+++ b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/repository/CaseRepository.java
@@ -0,0 +1,10 @@
+package eu.xenit.contentcloud.userapps.holmes.dcm.repository;
+
+import eu.xenit.contentcloud.userapps.holmes.dcm.model.Case;
+import java.util.UUID;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource
+interface CaseRepository extends JpaRepository<Case, UUID> {
+}
diff --git a/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/repository/PersonRepository.java b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/repository/PersonRepository.java
new file mode 100644
index 00000000..cafff0dc
--- /dev/null
+++ b/integration-tests/integration-tests-spring/src/main/java/eu/xenit/contentcloud/userapps/holmes/dcm/repository/PersonRepository.java
@@ -0,0 +1,10 @@
+package eu.xenit.contentcloud.userapps.holmes.dcm.repository;
+
+import eu.xenit.contentcloud.userapps.holmes.dcm.model.Person;
+import java.util.UUID;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource
+interface PersonRepository extends JpaRepository<Person, UUID> {
+}
diff --git a/integration-tests/integration-tests-spring/src/main/resources/application.yml b/integration-tests/integration-tests-spring/src/main/resources/application.yml
new file mode 100644
index 00000000..7a564099
--- /dev/null
+++ b/integration-tests/integration-tests-spring/src/main/resources/application.yml
@@ -0,0 +1,7 @@
+server:
+  port: ${PORT:8080}
+spring:
+  jpa:
+    properties:
+      hibernate:
+        globally_quoted_identifiers: true
diff --git a/integration-tests/integration-tests-spring/src/test/java/eu/xenit/contentcloud/userapps/holmes/dcm/DcmApiApplicationTests.java b/integration-tests/integration-tests-spring/src/test/java/eu/xenit/contentcloud/userapps/holmes/dcm/DcmApiApplicationTests.java
new file mode 100644
index 00000000..9dfb5929
--- /dev/null
+++ b/integration-tests/integration-tests-spring/src/test/java/eu/xenit/contentcloud/userapps/holmes/dcm/DcmApiApplicationTests.java
@@ -0,0 +1,15 @@
+package eu.xenit.contentcloud.userapps.holmes.dcm;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(properties = {
+		"spring.content.storage.type.default=fs"
+})
+class DcmApiApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}
diff --git a/integration-tests/settings.gradle b/integration-tests/settings.gradle
new file mode 100644
index 00000000..97e94cff
--- /dev/null
+++ b/integration-tests/settings.gradle
@@ -0,0 +1,21 @@
+rootProject.name = 'contentcloud-spring-boot-integration-tests'
+
+includeBuild('..') {
+    name = 'cc-spring-boot'
+}
+
+def springBootVersion = startParameter.getProjectProperties().get('springBootVersion')
+
+includeBuild('./integration-tests-spring') {
+    name = "it-spring"
+    if(springBootVersion) {
+        it.dependencySubstitution {
+            it.all { dependency ->
+                if (dependency.requested instanceof ModuleComponentSelector && dependency.requested.group == "org.springframework.boot" && dependency.requested.module == "org.springframework.boot.gradle.plugin") {
+                    System.out.println("${dependency.requested} -> ${springBootVersion}")
+                    dependency.useTarget("${dependency.requested.moduleIdentifier}:${springBootVersion}")
+                }
+            }
+        }
+    }
+}
\ No newline at end of file