diff --git a/CHANGES.md b/CHANGES.md
index b78a058cc..d0f56eed0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,8 +31,26 @@
 - Distribute fix enabled when two elements were selected (by @dfelinto) [Github #3266](https://github.com/penpot/penpot/pull/3266)
 - Distribute vertical spacing failing for overlapped text (by @dfelinto) [Github #3267](https://github.com/penpot/penpot/pull/3267)
 
+## 1.18.6 (Unreleased)
+
+### :bug: Bugs fixed
+
+- Fix comments navigation from workspace [Taiga #5504](https://tree.taiga.io/project/penpot/issue/5504)
+
+### :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
 
+### :bug: Bugs fixed
+
+- Fix add flow option in contextual menu for frames
+- Fix issues related with invitations
+- Fix problem with undefined gaps
+- Add deleted fonts auto match mechanism
+
 ## 1.18.4
 
 ### :bug: Bugs fixed
@@ -72,6 +90,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/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index 6e6ffd42f..cb527a729 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -1377,17 +1377,18 @@
                                  (not (contains? #{:group :bool} (:type head))))
 
             no-bool-shapes? (->> all-selected (some (comp #{:frame :text} :type)))]
-
-        (rx/concat
-         (when (and (some? shape) (not (contains? selected (:id shape))))
-           (rx/of (dws/select-shape (:id shape))))
-         (rx/of (show-context-menu
-                 (-> params
-                     (assoc
-                      :kind :shape
-                      :disable-booleans? (or no-bool-shapes? not-group-like?)
-                      :disable-flatten? no-bool-shapes?
-                      :selected (conj selected (:id shape)))))))))))
+        
+          (if (and (some? shape) (not (contains? selected (:id shape))))
+            (rx/concat
+              (rx/of (dws/select-shape (:id shape)))
+              (rx/of (show-shape-context-menu params)))
+            (rx/of (show-context-menu
+                     (-> params
+                         (assoc
+                           :kind :shape
+                           :disable-booleans? (or no-bool-shapes? not-group-like?)
+                           :disable-flatten? no-bool-shapes?
+                           :selected (conj selected (:id shape)))))))))))
 
 (defn show-page-item-context-menu
   [{:keys [position page] :as params}]
diff --git a/frontend/src/app/main/ui/workspace/comments.cljs b/frontend/src/app/main/ui/workspace/comments.cljs
index 3ff73b80d..02ac964b0 100644
--- a/frontend/src/app/main/ui/workspace/comments.cljs
+++ b/frontend/src/app/main/ui/workspace/comments.cljs
@@ -77,6 +77,7 @@
 
         on-thread-click
         (mf/use-callback
+         (mf/deps page-id)
          (fn [thread]
            (when (not= page-id (:page-id thread))
              (st/emit! (dw/go-to-page (:page-id thread))))
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;
 }