diff --git a/commit-event-service/Dockerfile b/commit-event-service/Dockerfile
index ff7cb28aab..f4b56a2d0a 100644
--- a/commit-event-service/Dockerfile
+++ b/commit-event-service/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO  - "https://github.com/sbt/sbt/releases/download/v1.9.7/sbt-1.9.7.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO  - "https://github.com/sbt/sbt/releases/download/v1.9.8/sbt-1.9.8.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project commit-event-service" stage  && \
diff --git a/event-log/Dockerfile b/event-log/Dockerfile
index b8eda91af6..3f31564a21 100644
--- a/event-log/Dockerfile
+++ b/event-log/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.7/sbt-1.9.7.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.8/sbt-1.9.8.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project event-log" stage && \
diff --git a/knowledge-graph/Dockerfile b/knowledge-graph/Dockerfile
index 4c620fcd50..d1fd8723a3 100644
--- a/knowledge-graph/Dockerfile
+++ b/knowledge-graph/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.7/sbt-1.9.7.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.8/sbt-1.9.8.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project knowledge-graph" stage && \
diff --git a/project/build.properties b/project/build.properties
index d415199524..8cf07b7c25 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
\ No newline at end of file
+sbt.version=1.9.8
\ No newline at end of file
diff --git a/token-repository/Dockerfile b/token-repository/Dockerfile
index 6ecf69d236..3db43dcb15 100644
--- a/token-repository/Dockerfile
+++ b/token-repository/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.7/sbt-1.9.7.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.8/sbt-1.9.8.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project token-repository" stage && \
diff --git a/token-repository/src/main/scala/io/renku/tokenrepository/repository/cleanup/ExpiringTokensFinder.scala b/token-repository/src/main/scala/io/renku/tokenrepository/repository/cleanup/ExpiringTokensFinder.scala
index 7f2f5a855c..e15ee3ecbc 100644
--- a/token-repository/src/main/scala/io/renku/tokenrepository/repository/cleanup/ExpiringTokensFinder.scala
+++ b/token-repository/src/main/scala/io/renku/tokenrepository/repository/cleanup/ExpiringTokensFinder.scala
@@ -64,7 +64,7 @@ private class ExpiringTokensFinderImpl[F[_]: Async: SessionResource: QueriesExec
     (Stream.eval(SessionResource[F].useK(measureExecutionTime(query))) ++ fetchAllChunks)
       .takeWhile(_.nonEmpty)
 
-  private lazy val query =
+  private def query =
     SqlStatement
       .named("find expiring tokens")
       .select[LocalDate, (Project, EncryptedAccessToken)](
diff --git a/triples-generator/Dockerfile b/triples-generator/Dockerfile
index a79b87eedb..501900266a 100644
--- a/triples-generator/Dockerfile
+++ b/triples-generator/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.7/sbt-1.9.7.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.8/sbt-1.9.8.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project triples-generator" stage && \
diff --git a/webhook-service/Dockerfile b/webhook-service/Dockerfile
index ed7890cb28..91700e8488 100644
--- a/webhook-service/Dockerfile
+++ b/webhook-service/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.7/sbt-1.9.7.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.9.8/sbt-1.9.8.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project webhook-service" stage  && \