diff --git a/.github/workflows/sonar-analysis.yml b/.github/workflows/sonar-analysis.yml
index 5e00d31..24dbfaa 100644
--- a/.github/workflows/sonar-analysis.yml
+++ b/.github/workflows/sonar-analysis.yml
@@ -13,10 +13,10 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
diff --git a/build.gradle b/build.gradle
index 4ee4bb7..fcb5f03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -179,7 +179,7 @@ sonarqube {
         property "sonar.projectKey", "OpenLMIS_openlmis-template-service"
         property "sonar.organization", "openlmis"
         property "sonar.host.url", "https://sonarcloud.io"
-        property "sonar.java.source", "11"
+        property "sonar.java.source", "17"
         property "sonar.coverage.jacoco.xmlReportPaths", "./report.xml"
     }
 }
@@ -190,7 +190,6 @@ pmd {
     ignoreFailures = false
     ruleSetFiles = files("config/pmd/ruleset.xml")
     reportsDir = file("build/reports/pmd")
-    incrementalAnalysis = false
 }
 
 tasks.withType(Pmd){
diff --git a/docker-compose.builder.yml b/docker-compose.builder.yml
index 891f907..4b11d8a 100644
--- a/docker-compose.builder.yml
+++ b/docker-compose.builder.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   builder:
-    image: openlmis/dev:6
+    image: openlmis/dev:7
     links:
       - db
       - log
@@ -15,7 +15,7 @@ services:
       JAVA_OPTS: '-Dlogging.config=/logback.xml'
     env_file: .env
   sonar:
-    image: openlmis/dev:6
+    image: openlmis/dev:7
     links:
       - db
       - log
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index a30f552..5f0cc43 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   template-service:
-    image: openlmis/dev:6
+    image: openlmis/dev:7
     ports:
       - "5005:5005"
       - "8080:8080"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c05..94336fc 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4c5803d..290541c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51..cccdd3d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or 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 UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$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"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -82,7 +66,6 @@ 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
@@ -126,11 +109,10 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((i+1))
     done
     case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -177,9 +159,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index a9f778a..e95643d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,19 +1,3 @@
-@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
@@ -29,11 +13,8 @@ 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"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -84,7 +65,6 @@ set CMD_LINE_ARGS=%*
 
 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 %CMD_LINE_ARGS%
 
diff --git a/src/integration-test/java/org/openlmis/template/AuditLogInitializerIntegrationTest.java b/src/integration-test/java/org/openlmis/template/AuditLogInitializerIntegrationTest.java
index e7f908e..cfcb7b6 100644
--- a/src/integration-test/java/org/openlmis/template/AuditLogInitializerIntegrationTest.java
+++ b/src/integration-test/java/org/openlmis/template/AuditLogInitializerIntegrationTest.java
@@ -43,7 +43,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-@ActiveProfiles({"test", "init-audit-log"})
+@ActiveProfiles({"test", "init-audit-log", "test-run"})
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class AuditLogInitializerIntegrationTest {
diff --git a/src/integration-test/java/org/openlmis/template/JaVersIntegrationTest.java b/src/integration-test/java/org/openlmis/template/JaVersIntegrationTest.java
index 41e569f..cf25c84 100644
--- a/src/integration-test/java/org/openlmis/template/JaVersIntegrationTest.java
+++ b/src/integration-test/java/org/openlmis/template/JaVersIntegrationTest.java
@@ -38,7 +38,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-@ActiveProfiles("test")
+@ActiveProfiles({"test", "test-run"})
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class JaVersIntegrationTest {
diff --git a/src/integration-test/java/org/openlmis/template/i18n/ExposedMessageSourceIntegrationTest.java b/src/integration-test/java/org/openlmis/template/i18n/ExposedMessageSourceIntegrationTest.java
index d9aa6ab..f4284e5 100644
--- a/src/integration-test/java/org/openlmis/template/i18n/ExposedMessageSourceIntegrationTest.java
+++ b/src/integration-test/java/org/openlmis/template/i18n/ExposedMessageSourceIntegrationTest.java
@@ -37,7 +37,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@ActiveProfiles("test")
+@ActiveProfiles({"test", "test-run"})
 public class ExposedMessageSourceIntegrationTest {
 
   @Autowired
diff --git a/src/integration-test/java/org/openlmis/template/repository/BaseCrudRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/template/repository/BaseCrudRepositoryIntegrationTest.java
index dc42dd3..adf2205 100644
--- a/src/integration-test/java/org/openlmis/template/repository/BaseCrudRepositoryIntegrationTest.java
+++ b/src/integration-test/java/org/openlmis/template/repository/BaseCrudRepositoryIntegrationTest.java
@@ -30,7 +30,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@ActiveProfiles("test")
+@ActiveProfiles({"test", "test-run"})
 @Transactional
 public abstract class BaseCrudRepositoryIntegrationTest<T extends BaseEntity> {
 
diff --git a/src/integration-test/java/org/openlmis/template/web/BaseWebIntegrationTest.java b/src/integration-test/java/org/openlmis/template/web/BaseWebIntegrationTest.java
index 95f8e1c..cb53957 100644
--- a/src/integration-test/java/org/openlmis/template/web/BaseWebIntegrationTest.java
+++ b/src/integration-test/java/org/openlmis/template/web/BaseWebIntegrationTest.java
@@ -52,7 +52,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
+@ActiveProfiles({"test", "test-run"})
 @SuppressWarnings({"PMD.TooManyMethods"})
 public abstract class BaseWebIntegrationTest {
 
diff --git a/src/main/java/org/openlmis/template/TestDataInitializer.java b/src/main/java/org/openlmis/template/TestDataInitializer.java
index 1a481ac..5bf89f4 100644
--- a/src/main/java/org/openlmis/template/TestDataInitializer.java
+++ b/src/main/java/org/openlmis/template/TestDataInitializer.java
@@ -29,7 +29,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
-@Profile("demo-data")
+@Profile("demo-data & !test-run")
 @Order(5)
 public class TestDataInitializer implements CommandLineRunner {
   private static final XLogger XLOGGER = XLoggerFactory.getXLogger(TestDataInitializer.class);