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 98371ee..677d3f6 100644
--- a/ci/.env.ci
+++ b/ci/.env.ci
@@ -9,8 +9,7 @@ DATABASE_URL="postgresql://mobicoop:mobicoop@v3-db:5432/mobicoop?schema=public"
 RMQ_URI=amqp://v3-ad-broker:5672
 
 # MESSAGE BROKER
-BROKER_IMAGE=rabbitmq:3-alpine
+BROKER_IMAGE=docker.io/rabbitmq:3-alpine
 
 # POSTGRES
-POSTGRES_IMAGE=postgres:15.0
-
+POSTGRES_IMAGE=docker.io/postgres:15.0
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