diff --git a/Dockerfile b/Dockerfile
index 187824e..594e2cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,13 @@
 FROM node:18-alpine 
 WORKDIR /rems-admin
+
+ARG PORT=8090
+ENV PORT=${PORT}
+
 COPY --chown=node:node . .
 RUN npm install
 EXPOSE 8090
+
+HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://localhost:${PORT} || exit 1
 EXPOSE 8095
 CMD npm run start
\ No newline at end of file
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 824d383..051e83b 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,9 +1,16 @@
 FROM node:18-alpine 
 WORKDIR /rems-admin
+
+ARG PORT=8090
+ENV PORT=${PORT}
+
 COPY --chown=node:node . .
 RUN npm install
 EXPOSE 8090
 EXPOSE 8091
+
+HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://localhost:${PORT} || exit 1
+
 EXPOSE 8095
 EXPOSE 8096
 CMD ./dockerRunnerDev.sh
\ No newline at end of file
diff --git a/src/rems-cds-hooks b/src/rems-cds-hooks
index 8a51ac5..1071035 160000
--- a/src/rems-cds-hooks
+++ b/src/rems-cds-hooks
@@ -1 +1 @@
-Subproject commit 8a51ac5c6837549e43a30c4f886c0bfd2aeae50d
+Subproject commit 1071035ca8b87ac1f8fc3614cab4781c5503cc3b