diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml
index 2f4af13..c50508b 100644
--- a/compose/docker-compose.override-lnd.yml
+++ b/compose/docker-compose.override-lnd.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   lnd:
-    image: lightninglabs/lnd:${LND_TAG:-v0.17.2-beta@sha256:cb24c0a7778cce16b30b22e97826d8b971bec0c2f40aba797fe555ac1e82ece4}
+    image: lightninglabs/lnd:${LND_TAG:-v0.17.4-beta@sha256:668eba1fdb1ac520292db95a57059be91895fb8af076eafd6c8b5e757f0f196c}
     restart: always
     network_mode: service:tor
     container_name: lnd${SUFFIX}
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 753dcf7..ee9b3b0 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       - ${BITCOIN_CONF:?}:${GUEST_BITCOIN:?}/bitcoin.conf
 
   daphne:
-    image: recksato/robosats:${ROBOSATS_TAG:-v0.5.4-alpha@sha256:6cff144c8943f2bbe24186258055019ccc3fe21b6ddf9423a04d99aa5dabe79c}
+    image: recksato/robosats:${ROBOSATS_TAG:-v0.6.0-alpha@sha256:8cc975ff5942a3fb2a09827b8eaafebea1c851eb3ecf9be1aaac1f238cfa9fc1}
     container_name: daphne${SUFFIX}
     restart: always
     network_mode: service:tor
@@ -48,7 +48,7 @@ services:
     network_mode: service:tor
 
   robosats:
-    image: recksato/robosats:${ROBOSATS_TAG:-v0.5.4-alpha@sha256:6cff144c8943f2bbe24186258055019ccc3fe21b6ddf9423a04d99aa5dabe79c}
+    image: recksato/robosats:${ROBOSATS_TAG:-v0.6.0-alpha@sha256:8cc975ff5942a3fb2a09827b8eaafebea1c851eb3ecf9be1aaac1f238cfa9fc1}
     container_name: rs${SUFFIX}
     restart: always
     environment:
@@ -85,7 +85,7 @@ services:
     network_mode: service:tor
 
   clean-orders:
-    image: recksato/robosats:${ROBOSATS_TAG:-v0.5.4-alpha@sha256:6cff144c8943f2bbe24186258055019ccc3fe21b6ddf9423a04d99aa5dabe79c}
+    image: recksato/robosats:${ROBOSATS_TAG:-v0.6.0-alpha@sha256:8cc975ff5942a3fb2a09827b8eaafebea1c851eb3ecf9be1aaac1f238cfa9fc1}
     restart: always
     container_name: clord${SUFFIX}
     command: python3 manage.py clean_orders
@@ -96,7 +96,7 @@ services:
     network_mode: service:tor
 
   follow-invoices:
-    image: recksato/robosats:${ROBOSATS_TAG:-v0.5.4-alpha@sha256:6cff144c8943f2bbe24186258055019ccc3fe21b6ddf9423a04d99aa5dabe79c}
+    image: recksato/robosats:${ROBOSATS_TAG:-v0.6.0-alpha@sha256:8cc975ff5942a3fb2a09827b8eaafebea1c851eb3ecf9be1aaac1f238cfa9fc1}
     container_name: invo${SUFFIX}
     restart: always
     env_file:
@@ -107,7 +107,7 @@ services:
     network_mode: service:tor
 
   telegram-watcher:
-    image: recksato/robosats:${ROBOSATS_TAG:-v0.5.4-alpha@sha256:6cff144c8943f2bbe24186258055019ccc3fe21b6ddf9423a04d99aa5dabe79c}
+    image: recksato/robosats:${ROBOSATS_TAG:-v0.6.0-alpha@sha256:8cc975ff5942a3fb2a09827b8eaafebea1c851eb3ecf9be1aaac1f238cfa9fc1}
     container_name: tg${SUFFIX}
     restart: always
     environment:
@@ -118,7 +118,7 @@ services:
     network_mode: service:tor
 
   celery:
-    image: recksato/robosats:${ROBOSATS_TAG:-v0.5.4-alpha@sha256:6cff144c8943f2bbe24186258055019ccc3fe21b6ddf9423a04d99aa5dabe79c}
+    image: recksato/robosats:${ROBOSATS_TAG:-v0.6.0-alpha@sha256:8cc975ff5942a3fb2a09827b8eaafebea1c851eb3ecf9be1aaac1f238cfa9fc1}
     container_name: cele${SUFFIX}
     restart: always
     env_file:
@@ -131,7 +131,7 @@ services:
     network_mode: service:tor
 
   celery-beat:                                 
-    image: recksato/robosats:${ROBOSATS_TAG:-v0.5.4-alpha@sha256:6cff144c8943f2bbe24186258055019ccc3fe21b6ddf9423a04d99aa5dabe79c}
+    image: recksato/robosats:${ROBOSATS_TAG:-v0.6.0-alpha@sha256:8cc975ff5942a3fb2a09827b8eaafebea1c851eb3ecf9be1aaac1f238cfa9fc1}
     container_name: beat${SUFFIX}
     restart: always
     env_file:
diff --git a/compose/env-sample/clntn/compose.env b/compose/env-sample/clntn/compose.env
index 5edb279..9ab2902 100644
--- a/compose/env-sample/clntn/compose.env
+++ b/compose/env-sample/clntn/compose.env
@@ -1,6 +1,6 @@
 # Uncomment the dockerhub tags to override the image versions localy without need to fork the docker-compose.yml
 
-# ROBOSATS_TAG='v0.5.4-alpha@sha256:6cff144c8943f2bbe24186258055019ccc3fe21b6ddf9423a04d99aa5dabe79c'
+# ROBOSATS_TAG='v0.6.0-alpha@sha256:8cc975ff5942a3fb2a09827b8eaafebea1c851eb3ecf9be1aaac1f238cfa9fc1'
 # BITCOIND_TAG='24.0.1-alpine@sha256:624b6fb1c282a3db6438ff35fbb9eed6ae260c66ffbb427ae72edd7da6a0ecdc'
 # REDIS_TAG='7.2.1-alpine@sha256:7f5a0dfbf379db69dc78434091dce3220e251022e71dcdf36207928cbf9010de'
 # NGINX_TAG='1.25.2-alpine-slim@sha256:1b0cb433e90260a96528c987ee78b797e842d510473935304a0931536d10f50d'
diff --git a/compose/env-sample/clntn/robosats.env b/compose/env-sample/clntn/robosats.env
index 04a8e27..0ad1c66 100644
--- a/compose/env-sample/clntn/robosats.env
+++ b/compose/env-sample/clntn/robosats.env
@@ -50,12 +50,18 @@ MARKET_PRICE_APIS = 'https://blockchain.info/ticker, https://api.yadio.io/exrate
 
 # Host e.g. 'robotesta15gf7845r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion'
 HOST_NAME = 'robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion'
-HOST_NAME2 = 'robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion'
+HOST_NAME2 = '*' # Do not change
 I2P_ALIAS = ''
 I2P_LONG = ''
 LOCAL_ALIAS = ''
 ONION_LOCATION = 'robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion'
 
+# Geoblocked countries (will reject F2F trades).
+# List of A3 country codes (see fhttps://en.wikipedia.org/wiki/ISO_3166-1_alpha-3)
+# Leave empty '' to allow all countries.
+# Example 'NOR,USA,CZE'.
+GEOBLOCKED_COUNTRIES = 'ABW,AFG,AGO'
+
 # Link to robosats alternative site (shown in frontend in statsfornerds so users can switch mainnet/testnet)
 ALTERNATIVE_SITE = 'RoboSats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion'
 ALTERNATIVE_NAME = 'RoboSats Mainnet'
@@ -68,6 +74,8 @@ THE_OTHER_ROBOSATS = 'robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.o
 # Telegram bot token
 TELEGRAM_TOKEN = ''
 TELEGRAM_BOT_NAME = ''
+# Telegram chat id to receive admin notifications
+TELEGRAM_COORDINATOR_CHAT_ID = 'AdminNotificationChatId'
 # Notify new messages in-chat app (fiat exchange step) if at least X minutes has passed since the last chat message.
 CHAT_NOTIFICATION_TIMEGAP = 5
 
diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env
index 173383b..329279b 100644
--- a/compose/env-sample/lndtn/compose.env
+++ b/compose/env-sample/lndtn/compose.env
@@ -1,12 +1,12 @@
 # Uncomment the dockerhub tags to override the image versions localy without need to fork the docker-compose.yml
 
-# ROBOSATS_TAG='v0.5.4-alpha@sha256:6cff144c8943f2bbe24186258055019ccc3fe21b6ddf9423a04d99aa5dabe79c'
+# ROBOSATS_TAG='v0.6.0-alpha@sha256:8cc975ff5942a3fb2a09827b8eaafebea1c851eb3ecf9be1aaac1f238cfa9fc1'
 # BITCOIND_TAG='24.0.1-alpine@sha256:624b6fb1c282a3db6438ff35fbb9eed6ae260c66ffbb427ae72edd7da6a0ecdc'
 # REDIS_TAG='7.2.1-alpine@sha256:7f5a0dfbf379db69dc78434091dce3220e251022e71dcdf36207928cbf9010de'
 # NGINX_TAG='1.25.2-alpine-slim@sha256:1b0cb433e90260a96528c987ee78b797e842d510473935304a0931536d10f50d'
 # POSTGRES_TAG='14.2-alpine@sha256:2fb5718f2a23dbac9bd1258e886eee90250a5903785e3136d62dd65e19f34982'
 
-# LND_TAG='v0.17.2-beta@sha256:cb24c0a7778cce16b30b22e97826d8b971bec0c2f40aba797fe555ac1e82ece4'
+# LND_TAG='v0.17.4-beta@sha256:668eba1fdb1ac520292db95a57059be91895fb8af076eafd6c8b5e757f0f196c'
 # THUNDERHUB_TAG='v0.13.23@sha256:5ad834045dc3030ec199615827c415ca07729da32c4739afd3adfc662af4fe65'
 # LIT_TAG='v0.11.0-alpha@sha256:dc14c495f699b14c2d75c43097ad3ab40e7287fc136a3203df9cffe17b867b71'
 
diff --git a/compose/env-sample/lndtn/robosats.env b/compose/env-sample/lndtn/robosats.env
index fe7074b..aa1474b 100644
--- a/compose/env-sample/lndtn/robosats.env
+++ b/compose/env-sample/lndtn/robosats.env
@@ -50,12 +50,18 @@ MARKET_PRICE_APIS = 'https://blockchain.info/ticker, https://api.yadio.io/exrate
 
 # Host e.g. 'robotesta15gf7845r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion'
 HOST_NAME = 'robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion'
-HOST_NAME2 = 'robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion'
+HOST_NAME2 = '*' # Do not change
 I2P_ALIAS = ''
 I2P_LONG = ''
 LOCAL_ALIAS = ''
 ONION_LOCATION = 'robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion'
 
+# Geoblocked countries (will reject F2F trades).
+# List of A3 country codes (see fhttps://en.wikipedia.org/wiki/ISO_3166-1_alpha-3)
+# Leave empty '' to allow all countries.
+# Example 'NOR,USA,CZE'.
+GEOBLOCKED_COUNTRIES = 'ABW,AFG,AGO'
+
 # Link to robosats alternative site (shown in frontend in statsfornerds so users can switch mainnet/testnet)
 ALTERNATIVE_SITE = 'RoboSats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion'
 ALTERNATIVE_NAME = 'RoboSats Mainnet'
@@ -68,6 +74,9 @@ THE_OTHER_ROBOSATS = 'robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.o
 # Telegram bot token
 TELEGRAM_TOKEN = ''
 TELEGRAM_BOT_NAME = ''
+# Telegram chat id to receive admin notifications
+TELEGRAM_COORDINATOR_CHAT_ID = 'AdminNotificationChatId'
+
 # Notify new messages in-chat app (fiat exchange step) if at least X minutes has passed since the last chat message.
 CHAT_NOTIFICATION_TIMEGAP = 5