diff --git a/generator/src/templates/nginx/http/gateway/glue.server.conf.twig b/generator/src/templates/nginx/http/gateway/glue.server.conf.twig
index 9f17f590e..aa08b4845 100644
--- a/generator/src/templates/nginx/http/gateway/glue.server.conf.twig
+++ b/generator/src/templates/nginx/http/gateway/glue.server.conf.twig
@@ -7,6 +7,9 @@
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $connection_upgrade;
         proxy_set_header X-SCHEMA-BASE-URL $scheme://$host;
-        proxy_pass http://cli:9000/glueSchema/;
+        
+        resolver 127.0.0.11 valid=10s;
+        set $cli_proxy_pass http://cli:9000/glueSchema/;
+        proxy_pass $cli_proxy_pass;
     }
 {% endblock locations %}
diff --git a/images/common/cli/Dockerfile b/images/common/cli/Dockerfile
index ea27dcb52..661117ecf 100644
--- a/images/common/cli/Dockerfile
+++ b/images/common/cli/Dockerfile
@@ -69,7 +69,8 @@ COPY --chown=spryker:spryker cli /home/spryker/bin
 RUN find /home/spryker/bin -type f -exec chmod +x {} \;
 ENV PATH=/home/spryker/bin:$PATH
 
-RUN mkdir -p /home/spryker/ssh-relay/ && chmod 777 /home/spryker/ssh-relay && touch /home/spryker/ssh-relay/ssh-auth.sock && chmod 666 /home/spryker/ssh-relay/ssh-auth.sock
+RUN mkdir -p /home/spryker/ssh-relay/ && chmod 777 /home/spryker/ssh-relay && touch /home/spryker/ssh-relay/ssh-auth.sock && chmod 666 /home/spryker/ssh-relay/ssh-auth.sock \
+  && touch /tmp/stdout && touch /tmp/stderr && chmod 666 /tmp/stdout && chmod 666 /tmp/stderr
 
 RUN mkdir -p /home/spryker/history && touch /home/spryker/history/.bash_history && chmod 0600 /home/spryker/history/.bash_history
 ENV HISTFILE=/home/spryker/history/.bash_history