diff --git a/docker-compose.yml b/docker-compose.yml
index 2fd5560..5fa7283 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       context: shutter
       args:
         ASSETS_VERSION: shutter-gnosis-1000-set1.3 # $NETWORK-10*$CHAIN_ID-set-$VERSION
-        UPSTREAM_VERSION: v1.2.5
+        UPSTREAM_VERSION: v1.3.6
         KEYPER_CONFIG_DIR: /keyper/config
         SHUTTER_CHAIN_DIR: /chain
         STAKER_SCRIPTS_VERSION: v0.1.0
diff --git a/shutter/go-shutter-settings/settings/keyper.go b/shutter/go-shutter-settings/settings/keyper.go
index 0970ffc..97ea5da 100644
--- a/shutter/go-shutter-settings/settings/keyper.go
+++ b/shutter/go-shutter-settings/settings/keyper.go
@@ -34,7 +34,7 @@ type KeyperConfig struct {
 		ListenAddresses          []string `env:"SHUTTER_P2P_LISTENADDRESSES"`
 		AdvertiseAddresses       []string `env:"SHUTTER_P2P_ADVERTISEADDRESSES"`
 		CustomBootstrapAddresses []string `env:"_ASSETS_CUSTOM_BOOTSTRAP_ADDRESSES"`
-		DiscoveryNamespace       string   `env:"_ASSETS_DISCOVERY_NAME_PREFIX"`
+		DiscoveryNamespace       string   `env:"SHUTTER_DISCOVERY_NAMESPACE"`
 	}
 	Shuttermint struct {
 		ShuttermintURL     string `env:"SHUTTER_SHUTTERMINT_SHUTTERMINTURL"`
diff --git a/shutter/scripts/configure_keyper.sh b/shutter/scripts/configure_keyper.sh
index b5c6e81..e2363ae 100755
--- a/shutter/scripts/configure_keyper.sh
+++ b/shutter/scripts/configure_keyper.sh
@@ -20,6 +20,7 @@ export SHUTTER_BEACONAPIURL=$(get_beacon_api_url_from_global_env "$NETWORK" "$SU
 export SHUTTER_GNOSIS_NODE_CONTRACTSURL=http://execution.gnosis.dncore.dappnode:8545
 export SHUTTER_GNOSIS_NODE_ETHEREUMURL=$(get_execution_ws_url_from_global_env "$NETWORK" "$SUPPORTED_NETWORKS")
 export VALIDATOR_PUBLIC_KEY=$(cat "${SHUTTER_CHAIN_DIR}/config/priv_validator_pubkey.hex")
+export SHUTTER_DISCOVERY_NAMESPACE="${_ASSETS_DISCOVERY_NAME_PREFIX}-${_ASSETS_INSTANCE_ID}"
 export SHUTTER_METRICS_ENABLED=${SHUTTER_PUSH_METRICS_ENABLED}
 
 echo "[INFO | configure] LISTEN: $SHUTTER_P2P_LISTENADDRESSES"