diff --git a/services/api-gateway/Dockerfile b/services/api-gateway/Dockerfile
index f40464af80ca4887df946d9303eb26fa4e64eeef..b2a18512b3d3f7d15f0fe6ac61a91778c13a34bb 100644
--- a/services/api-gateway/Dockerfile
+++ b/services/api-gateway/Dockerfile
@@ -57,7 +57,7 @@ COPY sudoers /etc/sudoers
 #------------------------
 
 RUN cd /opt && git clone https://git.astron.nl/astron-sdc/esap-api-gateway.git
-RUN cd /opt/esap-api-gateway && git pull && git checkout 74188b358615fd4e8f0fc60dfa6a19d2f38426ab
+RUN cd /opt/esap-api-gateway && git pull && git checkout 557c921
 RUN chown -R esap:esap /opt/esap-api-gateway
 
 
diff --git a/services/gui/Dockerfile b/services/gui/Dockerfile
index cbf78c3180591a38ea4b06c9bfdc7716dda14c44..306fee102f88509bd2edec03f72322f6c50f7625 100644
--- a/services/gui/Dockerfile
+++ b/services/gui/Dockerfile
@@ -43,7 +43,7 @@ COPY sudoers /etc/sudoers
 #------------------------
 
 RUN cd /opt && git clone https://git.astron.nl/astron-sdc/esap-gui.git
-RUN cd /opt/esap-gui && git pull && git checkout 0be8125b478007c75b13002d4e5273af7e14c057
+RUN cd /opt/esap-gui && git pull && git checkout 2882da5a
 RUN cd /opt/esap-gui && npm install
 RUN cd /opt/esap-gui && npm run build