diff --git a/services/pcp-ballistics-service/Dockerfile b/services/pcp-ballistics-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-ballistics-service/Dockerfile
+++ b/services/pcp-ballistics-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/pcp-complex-mission-service/Dockerfile b/services/pcp-complex-mission-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-complex-mission-service/Dockerfile
+++ b/services/pcp-complex-mission-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/pcp-coverage-scheme-service/Dockerfile b/services/pcp-coverage-scheme-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-coverage-scheme-service/Dockerfile
+++ b/services/pcp-coverage-scheme-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/pcp-dynamic-plan-service/Dockerfile b/services/pcp-dynamic-plan-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-dynamic-plan-service/Dockerfile
+++ b/services/pcp-dynamic-plan-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/pcp-mission-planing-service/Dockerfile b/services/pcp-mission-planing-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-mission-planing-service/Dockerfile
+++ b/services/pcp-mission-planing-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/pcp-request-service/Dockerfile b/services/pcp-request-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-request-service/Dockerfile
+++ b/services/pcp-request-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/pcp-satellite-catalog-service/Dockerfile b/services/pcp-satellite-catalog-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-satellite-catalog-service/Dockerfile
+++ b/services/pcp-satellite-catalog-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/pcp-srpring-boot-admin-server/Dockerfile b/services/pcp-srpring-boot-admin-server/Dockerfile
index e5ffd01..2c36b44 100644
--- a/services/pcp-srpring-boot-admin-server/Dockerfile
+++ b/services/pcp-srpring-boot-admin-server/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS="-jar"
 
diff --git a/services/pcp-stations-service/Dockerfile b/services/pcp-stations-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-stations-service/Dockerfile
+++ b/services/pcp-stations-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/pcp-tgu-service/Dockerfile b/services/pcp-tgu-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-tgu-service/Dockerfile
+++ b/services/pcp-tgu-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/pcp-ui-service/Dockerfile b/services/pcp-ui-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/pcp-ui-service/Dockerfile
+++ b/services/pcp-ui-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/slots-service/Dockerfile b/services/slots-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/slots-service/Dockerfile
+++ b/services/slots-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""
 
diff --git a/services/spring-cloud-config-server/Dockerfile b/services/spring-cloud-config-server/Dockerfile
index b32686f..422a4e6 100644
--- a/services/spring-cloud-config-server/Dockerfile
+++ b/services/spring-cloud-config-server/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS="-jar"
 
diff --git a/services/tle-monitoring-service/Dockerfile b/services/tle-monitoring-service/Dockerfile
index e1af0fd..6fecd3c 100644
--- a/services/tle-monitoring-service/Dockerfile
+++ b/services/tle-monitoring-service/Dockerfile
@@ -1,4 +1,5 @@
-FROM bellsoft/liberica-openjre-alpine:21.0.5
+ARG RUNTIME_IMAGE=repo.nstart.cloud/bellsoft/liberica-openjre-alpine:21.0.5
+FROM ${RUNTIME_IMAGE}
 
 ENV JAVA_OPTS=""