diff --git a/packages/packages.json b/packages/packages.json
index e76e52c00..f1b21e940 100644
--- a/packages/packages.json
+++ b/packages/packages.json
@@ -1,13 +1,13 @@
 {
     "dev": {
         "skill/valory/market_manager_abci/0.1.0": "bafybeidnqerwkljbjgog73qaa5duu5ymsfjs6jsszeupseshx7go3n6afq",
-        "skill/valory/decision_maker_abci/0.1.0": "bafybeie2szzjtdnk2xq6m64lhsrf4m5ppidrynfgum3h7dy3l6dxlmv3xy",
-        "skill/valory/trader_abci/0.1.0": "bafybeibqegf243lvdq3bo2mlgrwho5qdm5tffvmyrxx7wdebqxnr7utpqi",
+        "skill/valory/decision_maker_abci/0.1.0": "bafybeiaubnxcztoon3izj4js6wajzdv3a64qst3cwow23q345526exbjsa",
+        "skill/valory/trader_abci/0.1.0": "bafybeiammcpvex74hcsju5lryontcejkm5ilr4zef6wjjems67wbjomrha",
         "contract/valory/market_maker/0.1.0": "bafybeidaz4dol7qsrwitw5jwasjtvd2vtlxhxizwkzen5kurblwacz4biu",
-        "agent/valory/trader/0.1.0": "bafybeibw3wozudkefplzo25d5qeokz257em6j4hjsgmyrxjcgw45zboafi",
-        "service/valory/trader/0.1.0": "bafybeihu7ur45nzs34pyxgtv7nqtvdighs4rgjad2gdnjc4get4q4y7paq",
+        "agent/valory/trader/0.1.0": "bafybeiclx4xy5ot25cfo4s3iw5nrj3fbgzv32rvl24nqrb2uwlkgp25kam",
+        "service/valory/trader/0.1.0": "bafybeiakf6j4mxljbbajvlxbs3byyria3ug2trscphycrehhcq6jekelae",
         "contract/valory/erc20/0.1.0": "bafybeid6p64a6tnovatbwybc6ocdd4u7bqkxsb4ks52rvf7ozcxxl6iaf4",
-        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidelvxpsjlywqswmkwg3gxtm6swxfz2wvu5bepv3nzle3l5xyrxnq",
+        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiaoczrcwq7vqwuibuirphjfqiah6hq3idufkqkzg4lcybfe6btaom",
         "contract/valory/mech/0.1.0": "bafybeiddc6pgurpyja2k64wzsb3jgcvl254s7rplgt5iooftsyfalqlbfq",
         "contract/valory/realitio/0.1.0": "bafybeibzyfaeaxgyqnygtduhprs47fhtskh2vnmw2cvpemqhkgc72q4wpm",
         "contract/valory/realitio_proxy/0.1.0": "bafybeibvndq6756qck7forgeavhdbn6ykgqs2ufyg7n5g6qdfpveatxuwy",
diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml
index 24ab6b9b7..377e0be90 100644
--- a/packages/valory/agents/trader/aea-config.yaml
+++ b/packages/valory/agents/trader/aea-config.yaml
@@ -41,10 +41,10 @@ skills:
 - valory/reset_pause_abci:0.1.0:bafybeigeoc363gv3wp2rrmk6p2fdxney33nxd3owtpfugzapgruwe4klyu
 - valory/termination_abci:0.1.0:bafybeigqpij2sgrpnilqjljfciixop4fldq5qceixc7534q6af4potdmdm
 - valory/transaction_settlement_abci:0.1.0:bafybeia7rzsbea3ch4gcafyp3z6uvqh4npws2xpdwbkkdbrqqpjops7nui
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidelvxpsjlywqswmkwg3gxtm6swxfz2wvu5bepv3nzle3l5xyrxnq
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiaoczrcwq7vqwuibuirphjfqiah6hq3idufkqkzg4lcybfe6btaom
 - valory/market_manager_abci:0.1.0:bafybeidnqerwkljbjgog73qaa5duu5ymsfjs6jsszeupseshx7go3n6afq
-- valory/decision_maker_abci:0.1.0:bafybeie2szzjtdnk2xq6m64lhsrf4m5ppidrynfgum3h7dy3l6dxlmv3xy
-- valory/trader_abci:0.1.0:bafybeibqegf243lvdq3bo2mlgrwho5qdm5tffvmyrxx7wdebqxnr7utpqi
+- valory/decision_maker_abci:0.1.0:bafybeiaubnxcztoon3izj4js6wajzdv3a64qst3cwow23q345526exbjsa
+- valory/trader_abci:0.1.0:bafybeiammcpvex74hcsju5lryontcejkm5ilr4zef6wjjems67wbjomrha
 default_ledger: ethereum
 required_ledgers:
 - ethereum
diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml
index 95dc21370..64f4fb4ee 100644
--- a/packages/valory/services/trader/service.yaml
+++ b/packages/valory/services/trader/service.yaml
@@ -7,7 +7,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq
 fingerprint_ignore_patterns: []
-agent: valory/trader:0.1.0:bafybeibw3wozudkefplzo25d5qeokz257em6j4hjsgmyrxjcgw45zboafi
+agent: valory/trader:0.1.0:bafybeiclx4xy5ot25cfo4s3iw5nrj3fbgzv32rvl24nqrb2uwlkgp25kam
 number_of_agents: 4
 deployment: {}
 ---
diff --git a/packages/valory/skills/decision_maker_abci/behaviours/tool_selection.py b/packages/valory/skills/decision_maker_abci/behaviours/tool_selection.py
index 6d9e94de3..5fb8407e4 100644
--- a/packages/valory/skills/decision_maker_abci/behaviours/tool_selection.py
+++ b/packages/valory/skills/decision_maker_abci/behaviours/tool_selection.py
@@ -198,9 +198,10 @@ def _select_tool(self) -> Generator[None, None, Optional[int]]:
         """Select a Mech tool based on an e-greedy policy and return its index."""
         yield from self._get_tools()
         self._set_policy()
-        selected = self.policy.select_tool()
+        selected_idx = self.policy.select_tool()
+        selected = self.mech_tools[selected_idx] if selected_idx is not None else "NaN"
         self.context.logger.info(f"Selected the mech tool {selected!r}.")
-        return selected
+        return selected_idx
 
     def async_act(self) -> Generator:
         """Do the action."""
diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml
index 44eca4acc..88518d3f5 100644
--- a/packages/valory/skills/decision_maker_abci/skill.yaml
+++ b/packages/valory/skills/decision_maker_abci/skill.yaml
@@ -21,7 +21,7 @@ fingerprint:
   behaviours/reedem.py: bafybeigzsx4wyov3ehfvdjmo2d7yimss4p7mbkopkqyr4gryxpa5rpv6ku
   behaviours/round_behaviour.py: bafybeig4tdktyu6hapoqymnxh2bgpds547st6a44heue657wkctwe4gjvm
   behaviours/sampling.py: bafybeiadikynvkaofbko72jc45xthhmmjfmlkpgramormhxwk5u47rnwdu
-  behaviours/tool_selection.py: bafybeidd7jmauc6edgt7caxylanfdz3ucb2qzsndszlxv7an4lohe2waja
+  behaviours/tool_selection.py: bafybeihplw663chhva7qko6b67tlmrblub7vvbgkxvvwqt62bwei6qxrde
   dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm
   fsm_specification.yaml: bafybeifnob3ceim2mj7lqagtnpwqjqqxs5eg3oiwc73gwm6x5i2dvvlcya
   handlers.py: bafybeihj33szgrcxnpd73s4nvluyxwwsvhjum2cuq3ilhhe6vfola3k7vy
diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml
index 17dca7365..b7d8de82a 100644
--- a/packages/valory/skills/trader_abci/skill.yaml
+++ b/packages/valory/skills/trader_abci/skill.yaml
@@ -25,8 +25,8 @@ skills:
 - valory/transaction_settlement_abci:0.1.0:bafybeia7rzsbea3ch4gcafyp3z6uvqh4npws2xpdwbkkdbrqqpjops7nui
 - valory/termination_abci:0.1.0:bafybeigqpij2sgrpnilqjljfciixop4fldq5qceixc7534q6af4potdmdm
 - valory/market_manager_abci:0.1.0:bafybeidnqerwkljbjgog73qaa5duu5ymsfjs6jsszeupseshx7go3n6afq
-- valory/decision_maker_abci:0.1.0:bafybeie2szzjtdnk2xq6m64lhsrf4m5ppidrynfgum3h7dy3l6dxlmv3xy
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidelvxpsjlywqswmkwg3gxtm6swxfz2wvu5bepv3nzle3l5xyrxnq
+- valory/decision_maker_abci:0.1.0:bafybeiaubnxcztoon3izj4js6wajzdv3a64qst3cwow23q345526exbjsa
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiaoczrcwq7vqwuibuirphjfqiah6hq3idufkqkzg4lcybfe6btaom
 behaviours:
   main:
     args: {}
diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml
index 59c237d92..d084b10cc 100644
--- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml
+++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml
@@ -20,7 +20,7 @@ contracts: []
 protocols: []
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq
-- valory/decision_maker_abci:0.1.0:bafybeie2szzjtdnk2xq6m64lhsrf4m5ppidrynfgum3h7dy3l6dxlmv3xy
+- valory/decision_maker_abci:0.1.0:bafybeiaubnxcztoon3izj4js6wajzdv3a64qst3cwow23q345526exbjsa
 behaviours:
   main:
     args: {}