diff --git a/.cirrus.yml b/.cirrus.yml
index 37626cc57..5adbd675b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,7 @@
 ---
 cirrus-ci_task:
   container:
-    image: toxchat/toktok-stack:0.0.23-third_party
+    image: toxchat/toktok-stack:0.0.31-release
     cpu: 2
     memory: 6G
   configure_script:
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index a7bfcf5ac..3d581b96e 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -40,8 +40,8 @@ find_package(Protobuf REQUIRED)
 include_directories(${PROTOBUF_INCLUDE_DIRS})
 
 find_package(JNI)
-if(JNI_FOUND)
-  include_directories(${JNI_INCLUDE_DIRS})
+if(JAVA_INCLUDE_PATH)
+  include_directories(${JAVA_INCLUDE_PATH})
 endif()
 
 include_directories("src")