diff --git a/geth-mainnet.yml b/geth-mainnet.yml
index 5db35166..a108e681 100644
--- a/geth-mainnet.yml
+++ b/geth-mainnet.yml
@@ -26,7 +26,8 @@ services:
         "--graphql",                               
         "--graphql.vhosts=*",             
         # Enable metrics collection and reporting                                                     
-        "--metrics",          
+        "--metrics",
+        "--metrics.addr=0.0.0.0",
         # Ethereum mainnet
         "--mainnet",                                                                                  
         # Maximum number of network peers (network disabled if set to 0) (default: 50)                
diff --git a/goerli.yml b/goerli.yml
index 4de786da..6ebc69a6 100644
--- a/goerli.yml
+++ b/goerli.yml
@@ -11,7 +11,7 @@ services:
       - geth-goerli:/.goerli
     networks:
       - chains
-    command: "--goerli --http --http.api eth,net --http.addr 0.0.0.0 --http.port 8545 --http.vhosts=* --syncmode full --datadir .goerli --verbosity 3 --metrics.addr 0.0.0.0 --pprof.addr 0.0.0.0"
+    command: "--goerli --http --http.api eth,net --http.addr 0.0.0.0 --http.port 8545 --http.vhosts=* --syncmode full --datadir .goerli --verbosity 3 --metrics --metrics.addr 0.0.0.0"
     labels:
       - "traefik.enable=true"
       - "traefik.http.middlewares.geth-goerli-stripprefix.stripprefix.prefixes=/goerli"
@@ -20,6 +20,10 @@ services:
       - "traefik.http.routers.geth-goerli.tls.certresolver=myresolver"
       - "traefik.http.routers.geth-goerli.rule=Host(`$DOMAIN`) && PathPrefix(`/goerli`)"
       - "traefik.http.routers.geth-goerli.middlewares=geth-goerli-stripprefix, ipwhitelist"
+      - "prometheus-scrape.enabled=true"
+      - "prometheus-scrape.port=6060"
+      - "prometheus-scrape.job_name=goerli"
+      - "prometheus-scrape.metrics_path=/debug/metrics/prometheus"
 
 volumes:
     geth-goerli:  
\ No newline at end of file
diff --git a/rinkeby.yml b/rinkeby.yml
index 7b237e89..360fafb3 100644
--- a/rinkeby.yml
+++ b/rinkeby.yml
@@ -11,7 +11,7 @@ services:
       - geth-rinkeby:/.rinkeby
     networks:
       - chains
-    command: "--rinkeby --http --http.api eth,net --http.addr 0.0.0.0 --http.port 8545 --http.vhosts=* --syncmode full --datadir .rinkeby --verbosity 3 --metrics.addr 0.0.0.0 --pprof.addr 0.0.0.0"
+    command: "--rinkeby --http --http.api eth,net --http.addr 0.0.0.0 --http.port 8545 --http.vhosts=* --syncmode full --datadir .rinkeby --verbosity 3 --metrics --metrics.addr 0.0.0.0"
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
@@ -21,6 +21,10 @@ services:
       - "traefik.http.routers.geth-rinkeby.tls.certresolver=myresolver"
       - "traefik.http.routers.geth-rinkeby.rule=Host(`$DOMAIN`) && PathPrefix(`/rinkeby`)"
       - "traefik.http.routers.geth-rinkeby.middlewares=geth-rinkeby-stripprefix, ipwhitelist"
+      - "prometheus-scrape.enabled=true"
+      - "prometheus-scrape.port=6060"
+      - "prometheus-scrape.job_name=rinkeby"
+      - "prometheus-scrape.metrics_path=/debug/metrics/prometheus"
 
 volumes:
     geth-rinkeby:  
\ No newline at end of file