diff --git a/services/check_architecture.sh b/services/check_architecture.sh
new file mode 100755
index 0000000000000000000000000000000000000000..62cf2e35b2de8c15e6b4b37118c8ce6b06ed35f7
--- /dev/null
+++ b/services/check_architecture.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo "Checking all images architecture"
+
+IMAGES=$(docker images|grep -v "REPOSITORY"|awk '{ print $1 ":" $2 }')
+
+for i in $IMAGES; do
+  Architecture=$(docker inspect $i|grep Architecture|awk '{ print $2 }')
+
+  echo "Image $i with architecture $Architecture"
+done
diff --git a/services/docker-compose-capif.yml b/services/docker-compose-capif.yml
index 8ed11c38c5446df5773f389da98ad80bca5d41f9..6b5a504c5938bd2c690b5898eb84f0e514c67acb 100644
--- a/services/docker-compose-capif.yml
+++ b/services/docker-compose-capif.yml
@@ -1,6 +1,6 @@
 services:
   redis:
-    image: "redis:alpine"
+    image: "labs.etsi.org:5050/ocf/capif/redis:7.4.2-alpine"
     command: redis-server
     ports:
       - "6379:6379"
@@ -254,7 +254,7 @@ services:
       - nginx
 
   mongo:
-    image: mongo:6.0.2
+    image: labs.etsi.org:5050/ocf/capif/mongo:6.0.2
     logging:
       driver: 'none'
     restart: unless-stopped
@@ -263,7 +263,7 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: example
   
   mongo-express:
-    image: mongo-express:1.0.0-alpha.4
+    image: labs.etsi.org:5050/ocf/capif/mongo-express:1.0.0-alpha.4
     logging:
       driver: 'none'
     restart: unless-stopped
diff --git a/services/docker-compose-register.yml b/services/docker-compose-register.yml
index 02599a3278cb1f9d20e67cfee536062273d27ae7..4abed673d40d27ee70399e7de97d4895d9c82070 100644
--- a/services/docker-compose-register.yml
+++ b/services/docker-compose-register.yml
@@ -23,7 +23,7 @@ services:
        - mongo_register
 
   mongo_register:
-    image: mongo:6.0.2
+    image: labs.etsi.org:5050/ocf/capif/mongo:6.0.2
     logging:
       driver: 'none'
     restart: unless-stopped
@@ -32,7 +32,7 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: example
 
   mongo_register_express:
-    image: mongo-express:1.0.0-alpha.4
+    image: labs.etsi.org:5050/ocf/capif/mongo-express:1.0.0-alpha.4
     logging:
       driver: 'none'
     restart: unless-stopped
diff --git a/tools/base_images_scripts/push_base_images_ocf.sh b/tools/base_images_scripts/push_base_images_ocf.sh
index 0407dae67c19f89983742ec5b14781cd4af9aa84..2a9d472e49fa4006646d05e10bd4c3caacf7b596 100755
--- a/tools/base_images_scripts/push_base_images_ocf.sh
+++ b/tools/base_images_scripts/push_base_images_ocf.sh
@@ -7,8 +7,10 @@ PLATFORMS=("linux/arm64"
 BASIC_IMAGES=("python:3-slim-bullseye"
 "nginx:1.27.1"
 "vault:1.13.2"
-"ubuntu:20.04")
-
+"ubuntu:20.04"
+"redis:7.4.2-alpine"
+"mongo-express:1.0.0-alpha.4"
+"mongo:6.0.2")
 
 docker login labs.etsi.org:5050
 for basic_image in "${BASIC_IMAGES[@]}"; do