diff --git a/Dockerfile b/Dockerfile
index 59c44e3..87314cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # BUILD FOR LOCAL DEVELOPMENT
 ###################
 
-FROM node:18-alpine3.16 As development
+FROM docker.io/node:lts-hydrogen As development
 
 # Create app directory
 WORKDIR /usr/src/app
@@ -29,7 +29,7 @@ USER node
 # BUILD FOR PRODUCTION
 ###################
 
-FROM node:18-alpine3.16 As build
+FROM docker.io/node:lts-hydrogen As build
 
 WORKDIR /usr/src/app
 
@@ -63,7 +63,7 @@ USER node
 # PRODUCTION
 ###################
 
-FROM node:18-alpine3.16 As production
+FROM docker.io/node:lts-hydrogen As production
 
 # Copy package.json to be able to execute migration command
 COPY --chown=node:node package*.json ./
diff --git a/ci/.env.ci b/ci/.env.ci
index c5f1b70..c158c59 100644
--- a/ci/.env.ci
+++ b/ci/.env.ci
@@ -15,9 +15,9 @@ REDIS_PASSWORD=redis
 REDIS_PORT=6379
 
 # IMAGES
-BROKER_IMAGE=rabbitmq:3-alpine
-REDIS_IMAGE=redis:7.0-alpine
-POSTGRES_IMAGE=postgis/postgis:15-3.3
+BROKER_IMAGE=docker.io/rabbitmq:3-alpine
+REDIS_IMAGE=docker.io/redis:7.0-alpine
+POSTGRES_IMAGE=docker.io/postgis/postgis:15-3.3
 
 # DEFAULT CONFIGURATION
 
@@ -54,6 +54,3 @@ MAX_DETOUR_DURATION_RATIO=0.3
 GEOROUTER_TYPE=graphhopper
 # georouter url
 GEOROUTER_URL=http://localhost:8989
-
-
-
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 26b388a..6770fcb 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -2,7 +2,7 @@
 # BUILD FOR CI TESTING
 ###################
 
-FROM node:18-alpine3.16
+FROM docker.io/node:lts-hydrogen
 
 # Create app directory
 WORKDIR /usr/src/app