diff --git a/metrics/config/chiado/vmagent.yml b/metrics/config/chiado/vmagent.yml
index 409e19a..46fb93f 100644
--- a/metrics/config/chiado/vmagent.yml
+++ b/metrics/config/chiado/vmagent.yml
@@ -4,7 +4,7 @@ global:
 scrape_configs:
   - job_name: 'keyper'
     static_configs:
-      - targets: ["shutter.shutter-api-%{NETWORK}.dappnode:9200"]
+      - targets: ["shutter.shutter-api-chiado.dappnode:9200"]
         labels:
           instance: "kpr-%{KEYPER_NAME}"
           deployment: "%{_ASSETS_VERSION}"
@@ -13,7 +13,7 @@ scrape_configs:
   - job_name: 'shuttermint'
     metrics_path: /
     static_configs:
-      - targets: ["shutter.shutter-api-%{NETWORK}.dappnode:9200"]
+      - targets: ["shutter.shutter-api-chiado.dappnode:9200"]
         labels:
           instance: "kpr-%{KEYPER_NAME}"
           deployment: "%{_ASSETS_VERSION}"
diff --git a/metrics/config/gnosis/vmagent.yml b/metrics/config/gnosis/vmagent.yml
index 409e19a..01aaa9c 100644
--- a/metrics/config/gnosis/vmagent.yml
+++ b/metrics/config/gnosis/vmagent.yml
@@ -4,7 +4,7 @@ global:
 scrape_configs:
   - job_name: 'keyper'
     static_configs:
-      - targets: ["shutter.shutter-api-%{NETWORK}.dappnode:9200"]
+      - targets: ["shutter.shutter-api-gnosis.dappnode:9200"]
         labels:
           instance: "kpr-%{KEYPER_NAME}"
           deployment: "%{_ASSETS_VERSION}"
@@ -13,7 +13,7 @@ scrape_configs:
   - job_name: 'shuttermint'
     metrics_path: /
     static_configs:
-      - targets: ["shutter.shutter-api-%{NETWORK}.dappnode:9200"]
+      - targets: ["shutter.shutter-api-gnosis.dappnode:9200"]
         labels:
           instance: "kpr-%{KEYPER_NAME}"
           deployment: "%{_ASSETS_VERSION}"
diff --git a/package_variants/chiado/docker-compose.yml b/package_variants/chiado/docker-compose.yml
index aa4a1be..8069321 100644
--- a/package_variants/chiado/docker-compose.yml
+++ b/package_variants/chiado/docker-compose.yml
@@ -9,9 +9,9 @@ services:
         ASSETS_VERSION: shutter-api-chiado-102000-v0.0.0
     ports:
       - "24003:24003"
-      - "27656:26656"
-      - "27660:26660"
-      - "9200:9100"
+      - "27656:27656"
+      - "27660:27660"
+      - "9200:9200"
 
   metrics:
     build:
diff --git a/package_variants/gnosis/docker-compose.yml b/package_variants/gnosis/docker-compose.yml
index b843100..236f130 100644
--- a/package_variants/gnosis/docker-compose.yml
+++ b/package_variants/gnosis/docker-compose.yml
@@ -9,9 +9,9 @@ services:
         ASSETS_VERSION: shutter-api-gnosis-1000-v0.0.0
     ports:
       - "24003:24003"
-      - "27656:26656"
-      - "27660:26660"
-      - "9200:9100"
+      - "27656:27656"
+      - "27660:27660"
+      - "9200:9200"
 
   metrics:
     build: