diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 9905c59..429bb92 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   backport:
     name: Backport PR
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
       - name: Backport Action
diff --git a/mapstore/proxy.properties b/mapstore/proxy.properties
index e9c248f..22f1b59 100644
--- a/mapstore/proxy.properties
+++ b/mapstore/proxy.properties
@@ -19,7 +19,7 @@ defaultStreamByteSize=1024
 
 # hostname whitelist limit the accepted requesting hosts (where the client application is hosted), to avoid the proxy being used by anyone
 # you should set the list to accept only the host(s) where mapstore is deployed
-#hostnameWhitelist = localhost,demo1.geo-solutions.it,demo.geo-solutions.it
+hostnameWhitelist = demo.geo-solutions.it
 
 # mimetype whitelist limit the accepted values for the contentype header in response from the proxied host
 mimetypeWhitelist = application/force-download,text/html,text/plain,application/xml,text/xml,application/vnd.ogc.sld+xml,application/vnd.ogc.gml,application/json,application/vnd.ogc.wms_xml,application/x-www-form-urlencoded,image/png,application/pdf,text/csv,application/zip,text/csv;charset=UTF-8