diff --git a/Dockerfile b/Dockerfile
index a2c484b..4f5cf52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/nodejs-16-minimal
+FROM registry.access.redhat.com/ubi9/nodejs-18-minimal
 
 ENV TZ="Europe/Helsinki"
 
diff --git a/dev.Dockerfile b/dev.Dockerfile
index 4a010be..d50e7db 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:18-alpine
 
 ENV TZ="Europe/Helsinki"
 
@@ -9,4 +9,4 @@ RUN npm i
 
 EXPOSE 3000
 
-CMD ["npm", "run", "start:dev"]
+CMD ["node_modules/.bin/tsx", "watch", "--clear-screen=false", "src/index.ts"]