diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index afbe5b7416..de96a0c9a6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -156,8 +156,8 @@
       <module name="web_test" target="1.8" />
       <module name="webcapsule_main" target="1.6" />
       <module name="webcapsule_test" target="1.6" />
-      <module name="webserver-webcapsule_main" target="1.6" />
-      <module name="webserver-webcapsule_test" target="1.6" />
+      <module name="webserver-webcapsule_main" target="1.8" />
+      <module name="webserver-webcapsule_test" target="1.8" />
       <module name="webserver_integrationTest" target="1.8" />
       <module name="webserver_main" target="1.8" />
       <module name="webserver_test" target="1.8" />
diff --git a/client/rpc/build.gradle b/client/rpc/build.gradle
index bd234e8ee1..3b585cf164 100644
--- a/client/rpc/build.gradle
+++ b/client/rpc/build.gradle
@@ -15,6 +15,14 @@ configurations {
     smokeTestRuntime.extendsFrom runtime
 }
 
+compileKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
 sourceSets {
     integrationTest {
         kotlin {