diff --git a/Dockerfile b/Dockerfile
index c1b5dbf..4514f41 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM codenarc/codenarc:2.2.0-groovy3.0.8
+FROM codenarc/codenarc:3.6.0-groovy3.0.23
 
 RUN DEBIAN_FRONTEND=noninteractive \
 apt-get update && \
diff --git a/entrypoint.sh b/entrypoint.sh
index a832f78..98d4fdf 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,16 +3,25 @@ set -e
 
 if [ -n "${GITHUB_WORKSPACE}" ] ; then
   cd "${GITHUB_WORKSPACE}/${INPUT_WORKDIR}" || exit
-  
   git config --global --add safe.directory "$GITHUB_WORKSPACE" || exit
 fi
 
 export REVIEWDOG_GITHUB_API_TOKEN="${INPUT_GITHUB_TOKEN}"
 
-java -jar /lib/codenarc-all.jar \
-    -report="${INPUT_REPORT:-compact:stdout}" \
-    -rulesetfiles="${INPUT_RULESETFILES}" \
-    > result.txt
+if [ -n "$INPUT_SOURCE_FILES" ]; then
+  java -jar /lib/codenarc-all.jar \
+      -report="${INPUT_REPORT:-compact:stdout}" \
+      -rulesetfiles="${INPUT_RULESETFILES}" \
+      -basedir="." \
+      -includes="${INPUT_SOURCE_FILES}" \
+      > result.txt
+else
+  java -jar /lib/codenarc-all.jar \
+      -report="${INPUT_REPORT:-compact:stdout}" \
+      -rulesetfiles="${INPUT_RULESETFILES}" \
+      > result.txt
+fi
+
 
 < result.txt reviewdog -efm="%f:%l:%m" -efm="%f:%r:%m" \
     -name="codenarc" \