diff --git a/Dockerfile b/Dockerfile
index 9818dc2..d5574fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,15 @@
 FROM node:21-alpine
 WORKDIR /home/node/app/rems-directory
 
+ARG SERVER_PORT
+ENV SERVER_PORT=$SERVER_PORT
+
+ARG SERVER_HOST
+ENV SERVER_HOST=$SERVER_HOST
+
 COPY --chown=node:node . .
 RUN npm install
 EXPOSE 3323
 
-HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://localhost:33333/health || exit 1
+HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://${SERVER_HOST}:${SERVER_PORT}/health || exit 1
 CMD npm run dev
\ No newline at end of file
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 7ce1ce8..3193473 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,10 +1,16 @@
 FROM node:21-alpine
 WORKDIR /home/node/app/rems-directory
 
+ARG SERVER_PORT
+ENV SERVER_PORT=$SERVER_PORT
+
+ARG SERVER_HOST
+ENV SERVER_HOST=$SERVER_HOST
+
 COPY --chown=node:node . .
 RUN npm install
 EXPOSE 3323
 EXPOSE 3324
 
-HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://localhost:33333/health || exit 1
+HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://${SERVER_HOST}:${SERVER_PORT}/health || exit 1
 CMD ./dockerRunnerDev.sh
\ No newline at end of file