diff --git a/CHANGES.md b/CHANGES.md
index 990a8b2c9..8aec40f77 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 1.18.6 (Unreleased)
+
+### :sparkles: Enhancements
+
+- Add the ability to overwrite internal resolver with `PENPOT_INTERNAL_RESOLVER` environment
+  variable [GH #3310](https://github.com/penpot/penpot/issues/3310)
+
 ## 1.18.5
 
 ## 1.18.4
@@ -40,6 +47,7 @@
 ## 1.18.0
 
 ### :sparkles: New features
+
 - Adds more accessibility improvements in dashboard [Taiga #4577](https://tree.taiga.io/project/penpot/us/4577)
 - Adds paddings and gaps prediction on layout creation [Taiga #4838](https://tree.taiga.io/project/penpot/task/4838)
 - Add visual feedback when proportionally scaling text elements with **K** [Taiga #3415](https://tree.taiga.io/project/penpot/us/3415)
diff --git a/docker/images/files/nginx-entrypoint.sh b/docker/images/files/nginx-entrypoint.sh
index 00d8fddc9..c34245230 100644
--- a/docker/images/files/nginx-entrypoint.sh
+++ b/docker/images/files/nginx-entrypoint.sh
@@ -21,7 +21,8 @@ update_flags /var/www/app/js/config.js
 
 export PENPOT_BACKEND_URI=${PENPOT_BACKEND_URI:-http://penpot-backend:6060};
 export PENPOT_EXPORTER_URI=${PENPOT_EXPORTER_URI:-http://penpot-exporter:6061};
+export PENPOT_INTERNAL_RESOLVER=${PENPOT_INTERNAL_RESOLVER:-127.0.0.11};
 
-envsubst "\$PENPOT_BACKEND_URI,\$PENPOT_EXPORTER_URI" < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
+envsubst "\$PENPOT_BACKEND_URI,\$PENPOT_EXPORTER_URI,\$PENPOT_INTERNAL_RESOLVER" < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
 
 exec "$@";
diff --git a/docker/images/files/nginx.conf b/docker/images/files/nginx.conf
index 34b01a2ef..35b06e731 100644
--- a/docker/images/files/nginx.conf
+++ b/docker/images/files/nginx.conf
@@ -38,7 +38,7 @@ http {
 
     gzip_types text/plain text/css text/javascript application/javascript application/json application/transit+json;
 
-    resolver 127.0.0.11;
+    resolver $PENPOT_INTERNAL_RESOLVER;
 
     map $http_upgrade $connection_upgrade {
         default upgrade;
diff --git a/manage.sh b/manage.sh
index 79d1e568f..d724fef53 100755
--- a/manage.sh
+++ b/manage.sh
@@ -181,9 +181,9 @@ function build-docker-images {
 
     pushd ./docker/images;
 
-    docker build -t penpotapp/frontend:$CURRENT_BRANCH -f Dockerfile.frontend .;
-    docker build -t penpotapp/backend:$CURRENT_BRANCH -f Dockerfile.backend .;
-    docker build -t penpotapp/exporter:$CURRENT_BRANCH -f Dockerfile.exporter .;
+    docker build -t penpotapp/frontend:$CURRENT_BRANCH -t penpotapp/frontend:latest -f Dockerfile.frontend .;
+    docker build -t penpotapp/backend:$CURRENT_BRANCH -t penpotapp/backend:latest -f Dockerfile.backend .;
+    docker build -t penpotapp/exporter:$CURRENT_BRANCH -t penpotapp/exporter:latest -f Dockerfile.exporter .;
 
     popd;
 }
diff --git a/version.txt b/version.txt
index 8e8b0a933..04a8bc26d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.18.5
+1.18.6