diff --git a/tools/dorado/README.md b/tools/dorado/README.md
index 28be521b..cf9393e9 100644
--- a/tools/dorado/README.md
+++ b/tools/dorado/README.md
@@ -6,11 +6,11 @@ Dorado is distributed on
 but not tagged with a version.
 
 That means the hash for the current version has to be hard-coded into the
-wrapper. Unfortunately you have to pull a >6 GB container just to check the tool
-version. At least you can update the list of models at the same time (see
-below).
+wrapper. Unfortunately you have to pull a >6 GB container and run `dorado
+--version` just to check the tool version.
 
-**Make sure you do this when you update the wrapper**!
+You can update the list of models at the same time (see
+below). **You must do this when you update the wrapper**.
 
 ## Basecalling models
 
@@ -20,11 +20,17 @@ The models are bundled in the container at `/models` and made available by the
 container, doing this will also make them unavailable to Galaxy. Check the diff
 before you merge.
 
-Here's a one-liner to **replace** the contents of the loc file with the models that are bundled in the container `nanoporetech/dorado:shac2d8bc91ca2d043fed84d06cca92aaeb62bcc1cd`.
+The columns are `value`, `tool_version`, `name` and  `path`.
+
+Here's a one-liner to **update** the loc file with the models that are bundled
+in the container
+`nanoporetech/dorado:shac2d8bc91ca2d043fed84d06cca92aaeb62bcc1cd`. Note that you
+would use the hash for the current dorado version (obtained above), and the
+dorado version is manually passed to `awk`.
 
 ```bash
 apptainer exec docker://nanoporetech/dorado:shac2d8bc91ca2d043fed84d06cca92aaeb62bcc1cd \
     ls /models | \
-    awk '{print $0 "\t" $0 "\t/models/" $0}' \
-    > tool-data/dorado_models.loc.sample
+    awk -v tv="0.7.1" '{print tv "_" $0 "\t" tv "\t" $0 "\t/models/" $0}' \
+    >> tool-data/dorado_models.loc.sample
 ```
\ No newline at end of file
diff --git a/tools/dorado/dorado.xml b/tools/dorado/dorado.xml
index f959ca42..8f3d59b7 100644
--- a/tools/dorado/dorado.xml
+++ b/tools/dorado/dorado.xml
@@ -17,9 +17,11 @@ reads.pod5
     ]]></command>
     <inputs>
         <param name="pod5_file" type="data" format="fast5" label="Raw fast5 file"/>
-        <!-- TODO: the model needs to be linked to the tool version, e.g. to prevent trying to run a new model with a previous version of the tool. -->
         <param name="model" type="select">
-            <options from_data_table="dorado_models"/>
+            <options from_data_table="dorado_models">
+                <!-- only allow models that shipped with this tool_version -->
+                <filter type="static_value" column="1" value="@VERSION@" />
+            </options>
         </param>
     </inputs>
     <outputs>
diff --git a/tools/dorado/macros.xml b/tools/dorado/macros.xml
index 0a4a37ab..5708bc96 100644
--- a/tools/dorado/macros.xml
+++ b/tools/dorado/macros.xml
@@ -1,5 +1,5 @@
 <macros>
-    <!-- UPDATING: pull the latest container and check the version. Update both tokens. You can also update the model list. See README.md for more.  -->
+    <!-- UPDATING: pull the latest container and check the version. Update both tokens. You MUST also update the model list. See README.md for more.  -->
     <token name="@VERSION@">0.7.1</token>
     <token name="@CONTAINER_HASH@">1c65eb070a9fc1d88710c4dc09b06541f96fdd28</token>
     <xml name="requirements">
diff --git a/tools/dorado/tool-data/dorado_models.loc.sample b/tools/dorado/tool-data/dorado_models.loc.sample
index e16e5685..581ea4a5 100644
--- a/tools/dorado/tool-data/dorado_models.loc.sample
+++ b/tools/dorado/tool-data/dorado_models.loc.sample
@@ -1,58 +1,58 @@
-dna_r10.4.1_e8.2_260bps_fast@v4.1.0	dna_r10.4.1_e8.2_260bps_fast@v4.1.0	/models/dna_r10.4.1_e8.2_260bps_fast@v4.1.0
-dna_r10.4.1_e8.2_260bps_fast@v4.1.0_5mCG_5hmCG@v2	dna_r10.4.1_e8.2_260bps_fast@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_260bps_fast@v4.1.0_5mCG_5hmCG@v2
-dna_r10.4.1_e8.2_260bps_hac@v4.1.0	dna_r10.4.1_e8.2_260bps_hac@v4.1.0	/models/dna_r10.4.1_e8.2_260bps_hac@v4.1.0
-dna_r10.4.1_e8.2_260bps_hac@v4.1.0_5mCG_5hmCG@v2	dna_r10.4.1_e8.2_260bps_hac@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_260bps_hac@v4.1.0_5mCG_5hmCG@v2
-dna_r10.4.1_e8.2_260bps_sup@v4.1.0	dna_r10.4.1_e8.2_260bps_sup@v4.1.0	/models/dna_r10.4.1_e8.2_260bps_sup@v4.1.0
-dna_r10.4.1_e8.2_260bps_sup@v4.1.0_5mCG_5hmCG@v2	dna_r10.4.1_e8.2_260bps_sup@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_260bps_sup@v4.1.0_5mCG_5hmCG@v2
-dna_r10.4.1_e8.2_400bps_fast@v4.1.0	dna_r10.4.1_e8.2_400bps_fast@v4.1.0	/models/dna_r10.4.1_e8.2_400bps_fast@v4.1.0
-dna_r10.4.1_e8.2_400bps_fast@v4.1.0_5mCG_5hmCG@v2	dna_r10.4.1_e8.2_400bps_fast@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_400bps_fast@v4.1.0_5mCG_5hmCG@v2
-dna_r10.4.1_e8.2_400bps_fast@v4.2.0	dna_r10.4.1_e8.2_400bps_fast@v4.2.0	/models/dna_r10.4.1_e8.2_400bps_fast@v4.2.0
-dna_r10.4.1_e8.2_400bps_fast@v4.2.0_5mCG_5hmCG@v2	dna_r10.4.1_e8.2_400bps_fast@v4.2.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_400bps_fast@v4.2.0_5mCG_5hmCG@v2
-dna_r10.4.1_e8.2_400bps_fast@v4.3.0	dna_r10.4.1_e8.2_400bps_fast@v4.3.0	/models/dna_r10.4.1_e8.2_400bps_fast@v4.3.0
-dna_r10.4.1_e8.2_400bps_fast@v5.0.0	dna_r10.4.1_e8.2_400bps_fast@v5.0.0	/models/dna_r10.4.1_e8.2_400bps_fast@v5.0.0
-dna_r10.4.1_e8.2_400bps_hac@v4.1.0	dna_r10.4.1_e8.2_400bps_hac@v4.1.0	/models/dna_r10.4.1_e8.2_400bps_hac@v4.1.0
-dna_r10.4.1_e8.2_400bps_hac@v4.1.0_5mCG_5hmCG@v2	dna_r10.4.1_e8.2_400bps_hac@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_400bps_hac@v4.1.0_5mCG_5hmCG@v2
-dna_r10.4.1_e8.2_400bps_hac@v4.3.0	dna_r10.4.1_e8.2_400bps_hac@v4.3.0	/models/dna_r10.4.1_e8.2_400bps_hac@v4.3.0
-dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mCG_5hmCG@v1	dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mCG_5hmCG@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mCG_5hmCG@v1
-dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mC_5hmC@v1	dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mC_5hmC@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mC_5hmC@v1
-dna_r10.4.1_e8.2_400bps_hac@v4.3.0_6mA@v2	dna_r10.4.1_e8.2_400bps_hac@v4.3.0_6mA@v2	/models/dna_r10.4.1_e8.2_400bps_hac@v4.3.0_6mA@v2
-dna_r10.4.1_e8.2_400bps_hac@v5.0.0	dna_r10.4.1_e8.2_400bps_hac@v5.0.0	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0
-dna_r10.4.1_e8.2_400bps_hac@v5.0.0_4mC_5mC@v1	dna_r10.4.1_e8.2_400bps_hac@v5.0.0_4mC_5mC@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0_4mC_5mC@v1
-dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mCG_5hmCG@v1	dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mCG_5hmCG@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mCG_5hmCG@v1
-dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mC_5hmC@v1	dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mC_5hmC@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mC_5hmC@v1
-dna_r10.4.1_e8.2_400bps_hac@v5.0.0_6mA@v1	dna_r10.4.1_e8.2_400bps_hac@v5.0.0_6mA@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0_6mA@v1
-dna_r10.4.1_e8.2_400bps_sup@v4.1.0	dna_r10.4.1_e8.2_400bps_sup@v4.1.0	/models/dna_r10.4.1_e8.2_400bps_sup@v4.1.0
-dna_r10.4.1_e8.2_400bps_sup@v4.1.0_5mCG_5hmCG@v2	dna_r10.4.1_e8.2_400bps_sup@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_400bps_sup@v4.1.0_5mCG_5hmCG@v2
-dna_r10.4.1_e8.2_400bps_sup@v4.3.0	dna_r10.4.1_e8.2_400bps_sup@v4.3.0	/models/dna_r10.4.1_e8.2_400bps_sup@v4.3.0
-dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mCG_5hmCG@v1	dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mCG_5hmCG@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mCG_5hmCG@v1
-dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mC_5hmC@v1	dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mC_5hmC@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mC_5hmC@v1
-dna_r10.4.1_e8.2_400bps_sup@v4.3.0_6mA@v2	dna_r10.4.1_e8.2_400bps_sup@v4.3.0_6mA@v2	/models/dna_r10.4.1_e8.2_400bps_sup@v4.3.0_6mA@v2
-dna_r10.4.1_e8.2_400bps_sup@v5.0.0	dna_r10.4.1_e8.2_400bps_sup@v5.0.0	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0
-dna_r10.4.1_e8.2_400bps_sup@v5.0.0_4mC_5mC@v1	dna_r10.4.1_e8.2_400bps_sup@v5.0.0_4mC_5mC@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0_4mC_5mC@v1
-dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mCG_5hmCG@v1	dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mCG_5hmCG@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mCG_5hmCG@v1
-dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mC_5hmC@v1	dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mC_5hmC@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mC_5hmC@v1
-dna_r10.4.1_e8.2_400bps_sup@v5.0.0_6mA@v1	dna_r10.4.1_e8.2_400bps_sup@v5.0.0_6mA@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0_6mA@v1
-dna_r10.4.1_e8.2_5khz_stereo@v1.3	dna_r10.4.1_e8.2_5khz_stereo@v1.3	/models/dna_r10.4.1_e8.2_5khz_stereo@v1.3
-dna_r9.4.1_e8_fast@v3.4	dna_r9.4.1_e8_fast@v3.4	/models/dna_r9.4.1_e8_fast@v3.4
-dna_r9.4.1_e8_fast@v3.4_5mCG@v0.1	dna_r9.4.1_e8_fast@v3.4_5mCG@v0.1	/models/dna_r9.4.1_e8_fast@v3.4_5mCG@v0.1
-dna_r9.4.1_e8_fast@v3.4_5mCG_5hmCG@v0	dna_r9.4.1_e8_fast@v3.4_5mCG_5hmCG@v0	/models/dna_r9.4.1_e8_fast@v3.4_5mCG_5hmCG@v0
-dna_r9.4.1_e8_hac@v3.3	dna_r9.4.1_e8_hac@v3.3	/models/dna_r9.4.1_e8_hac@v3.3
-dna_r9.4.1_e8_hac@v3.3_5mCG@v0.1	dna_r9.4.1_e8_hac@v3.3_5mCG@v0.1	/models/dna_r9.4.1_e8_hac@v3.3_5mCG@v0.1
-dna_r9.4.1_e8_hac@v3.3_5mCG_5hmCG@v0	dna_r9.4.1_e8_hac@v3.3_5mCG_5hmCG@v0	/models/dna_r9.4.1_e8_hac@v3.3_5mCG_5hmCG@v0
-dna_r9.4.1_e8_sup@v3.3	dna_r9.4.1_e8_sup@v3.3	/models/dna_r9.4.1_e8_sup@v3.3
-dna_r9.4.1_e8_sup@v3.3_5mCG@v0.1	dna_r9.4.1_e8_sup@v3.3_5mCG@v0.1	/models/dna_r9.4.1_e8_sup@v3.3_5mCG@v0.1
-dna_r9.4.1_e8_sup@v3.3_5mCG_5hmCG@v0	dna_r9.4.1_e8_sup@v3.3_5mCG_5hmCG@v0	/models/dna_r9.4.1_e8_sup@v3.3_5mCG_5hmCG@v0
-dna_r9.4.1_e8_sup@v3.6	dna_r9.4.1_e8_sup@v3.6	/models/dna_r9.4.1_e8_sup@v3.6
-rna002_70bps_fast@v3	rna002_70bps_fast@v3	/models/rna002_70bps_fast@v3
-rna002_70bps_hac@v3	rna002_70bps_hac@v3	/models/rna002_70bps_hac@v3
-rna004_130bps_fast@v3.0.1	rna004_130bps_fast@v3.0.1	/models/rna004_130bps_fast@v3.0.1
-rna004_130bps_fast@v5.0.0	rna004_130bps_fast@v5.0.0	/models/rna004_130bps_fast@v5.0.0
-rna004_130bps_hac@v3.0.1	rna004_130bps_hac@v3.0.1	/models/rna004_130bps_hac@v3.0.1
-rna004_130bps_hac@v5.0.0	rna004_130bps_hac@v5.0.0	/models/rna004_130bps_hac@v5.0.0
-rna004_130bps_hac@v5.0.0_m6A@v1	rna004_130bps_hac@v5.0.0_m6A@v1	/models/rna004_130bps_hac@v5.0.0_m6A@v1
-rna004_130bps_hac@v5.0.0_pseU@v1	rna004_130bps_hac@v5.0.0_pseU@v1	/models/rna004_130bps_hac@v5.0.0_pseU@v1
-rna004_130bps_sup@v3.0.1	rna004_130bps_sup@v3.0.1	/models/rna004_130bps_sup@v3.0.1
-rna004_130bps_sup@v3.0.1_m6A_DRACH@v1	rna004_130bps_sup@v3.0.1_m6A_DRACH@v1	/models/rna004_130bps_sup@v3.0.1_m6A_DRACH@v1
-rna004_130bps_sup@v5.0.0	rna004_130bps_sup@v5.0.0	/models/rna004_130bps_sup@v5.0.0
-rna004_130bps_sup@v5.0.0_m6A@v1	rna004_130bps_sup@v5.0.0_m6A@v1	/models/rna004_130bps_sup@v5.0.0_m6A@v1
-rna004_130bps_sup@v5.0.0_pseU@v1	rna004_130bps_sup@v5.0.0_pseU@v1	/models/rna004_130bps_sup@v5.0.0_pseU@v1
+0.7.1_dna_r10.4.1_e8.2_260bps_fast@v4.1.0	0.7.1	dna_r10.4.1_e8.2_260bps_fast@v4.1.0	/models/dna_r10.4.1_e8.2_260bps_fast@v4.1.0
+0.7.1_dna_r10.4.1_e8.2_260bps_fast@v4.1.0_5mCG_5hmCG@v2	0.7.1	dna_r10.4.1_e8.2_260bps_fast@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_260bps_fast@v4.1.0_5mCG_5hmCG@v2
+0.7.1_dna_r10.4.1_e8.2_260bps_hac@v4.1.0	0.7.1	dna_r10.4.1_e8.2_260bps_hac@v4.1.0	/models/dna_r10.4.1_e8.2_260bps_hac@v4.1.0
+0.7.1_dna_r10.4.1_e8.2_260bps_hac@v4.1.0_5mCG_5hmCG@v2	0.7.1	dna_r10.4.1_e8.2_260bps_hac@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_260bps_hac@v4.1.0_5mCG_5hmCG@v2
+0.7.1_dna_r10.4.1_e8.2_260bps_sup@v4.1.0	0.7.1	dna_r10.4.1_e8.2_260bps_sup@v4.1.0	/models/dna_r10.4.1_e8.2_260bps_sup@v4.1.0
+0.7.1_dna_r10.4.1_e8.2_260bps_sup@v4.1.0_5mCG_5hmCG@v2	0.7.1	dna_r10.4.1_e8.2_260bps_sup@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_260bps_sup@v4.1.0_5mCG_5hmCG@v2
+0.7.1_dna_r10.4.1_e8.2_400bps_fast@v4.1.0	0.7.1	dna_r10.4.1_e8.2_400bps_fast@v4.1.0	/models/dna_r10.4.1_e8.2_400bps_fast@v4.1.0
+0.7.1_dna_r10.4.1_e8.2_400bps_fast@v4.1.0_5mCG_5hmCG@v2	0.7.1	dna_r10.4.1_e8.2_400bps_fast@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_400bps_fast@v4.1.0_5mCG_5hmCG@v2
+0.7.1_dna_r10.4.1_e8.2_400bps_fast@v4.2.0	0.7.1	dna_r10.4.1_e8.2_400bps_fast@v4.2.0	/models/dna_r10.4.1_e8.2_400bps_fast@v4.2.0
+0.7.1_dna_r10.4.1_e8.2_400bps_fast@v4.2.0_5mCG_5hmCG@v2	0.7.1	dna_r10.4.1_e8.2_400bps_fast@v4.2.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_400bps_fast@v4.2.0_5mCG_5hmCG@v2
+0.7.1_dna_r10.4.1_e8.2_400bps_fast@v4.3.0	0.7.1	dna_r10.4.1_e8.2_400bps_fast@v4.3.0	/models/dna_r10.4.1_e8.2_400bps_fast@v4.3.0
+0.7.1_dna_r10.4.1_e8.2_400bps_fast@v5.0.0	0.7.1	dna_r10.4.1_e8.2_400bps_fast@v5.0.0	/models/dna_r10.4.1_e8.2_400bps_fast@v5.0.0
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v4.1.0	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v4.1.0	/models/dna_r10.4.1_e8.2_400bps_hac@v4.1.0
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v4.1.0_5mCG_5hmCG@v2	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_400bps_hac@v4.1.0_5mCG_5hmCG@v2
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v4.3.0	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v4.3.0	/models/dna_r10.4.1_e8.2_400bps_hac@v4.3.0
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mCG_5hmCG@v1	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mCG_5hmCG@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mCG_5hmCG@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mC_5hmC@v1	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mC_5hmC@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v4.3.0_5mC_5hmC@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v4.3.0_6mA@v2	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v4.3.0_6mA@v2	/models/dna_r10.4.1_e8.2_400bps_hac@v4.3.0_6mA@v2
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v5.0.0	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v5.0.0	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v5.0.0_4mC_5mC@v1	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v5.0.0_4mC_5mC@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0_4mC_5mC@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mCG_5hmCG@v1	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mCG_5hmCG@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mCG_5hmCG@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mC_5hmC@v1	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mC_5hmC@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0_5mC_5hmC@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_hac@v5.0.0_6mA@v1	0.7.1	dna_r10.4.1_e8.2_400bps_hac@v5.0.0_6mA@v1	/models/dna_r10.4.1_e8.2_400bps_hac@v5.0.0_6mA@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v4.1.0	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v4.1.0	/models/dna_r10.4.1_e8.2_400bps_sup@v4.1.0
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v4.1.0_5mCG_5hmCG@v2	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v4.1.0_5mCG_5hmCG@v2	/models/dna_r10.4.1_e8.2_400bps_sup@v4.1.0_5mCG_5hmCG@v2
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v4.3.0	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v4.3.0	/models/dna_r10.4.1_e8.2_400bps_sup@v4.3.0
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mCG_5hmCG@v1	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mCG_5hmCG@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mCG_5hmCG@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mC_5hmC@v1	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mC_5hmC@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v4.3.0_5mC_5hmC@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v4.3.0_6mA@v2	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v4.3.0_6mA@v2	/models/dna_r10.4.1_e8.2_400bps_sup@v4.3.0_6mA@v2
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v5.0.0	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v5.0.0	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v5.0.0_4mC_5mC@v1	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v5.0.0_4mC_5mC@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0_4mC_5mC@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mCG_5hmCG@v1	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mCG_5hmCG@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mCG_5hmCG@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mC_5hmC@v1	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mC_5hmC@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0_5mC_5hmC@v1
+0.7.1_dna_r10.4.1_e8.2_400bps_sup@v5.0.0_6mA@v1	0.7.1	dna_r10.4.1_e8.2_400bps_sup@v5.0.0_6mA@v1	/models/dna_r10.4.1_e8.2_400bps_sup@v5.0.0_6mA@v1
+0.7.1_dna_r10.4.1_e8.2_5khz_stereo@v1.3	0.7.1	dna_r10.4.1_e8.2_5khz_stereo@v1.3	/models/dna_r10.4.1_e8.2_5khz_stereo@v1.3
+0.7.1_dna_r9.4.1_e8_fast@v3.4	0.7.1	dna_r9.4.1_e8_fast@v3.4	/models/dna_r9.4.1_e8_fast@v3.4
+0.7.1_dna_r9.4.1_e8_fast@v3.4_5mCG@v0.1	0.7.1	dna_r9.4.1_e8_fast@v3.4_5mCG@v0.1	/models/dna_r9.4.1_e8_fast@v3.4_5mCG@v0.1
+0.7.1_dna_r9.4.1_e8_fast@v3.4_5mCG_5hmCG@v0	0.7.1	dna_r9.4.1_e8_fast@v3.4_5mCG_5hmCG@v0	/models/dna_r9.4.1_e8_fast@v3.4_5mCG_5hmCG@v0
+0.7.1_dna_r9.4.1_e8_hac@v3.3	0.7.1	dna_r9.4.1_e8_hac@v3.3	/models/dna_r9.4.1_e8_hac@v3.3
+0.7.1_dna_r9.4.1_e8_hac@v3.3_5mCG@v0.1	0.7.1	dna_r9.4.1_e8_hac@v3.3_5mCG@v0.1	/models/dna_r9.4.1_e8_hac@v3.3_5mCG@v0.1
+0.7.1_dna_r9.4.1_e8_hac@v3.3_5mCG_5hmCG@v0	0.7.1	dna_r9.4.1_e8_hac@v3.3_5mCG_5hmCG@v0	/models/dna_r9.4.1_e8_hac@v3.3_5mCG_5hmCG@v0
+0.7.1_dna_r9.4.1_e8_sup@v3.3	0.7.1	dna_r9.4.1_e8_sup@v3.3	/models/dna_r9.4.1_e8_sup@v3.3
+0.7.1_dna_r9.4.1_e8_sup@v3.3_5mCG@v0.1	0.7.1	dna_r9.4.1_e8_sup@v3.3_5mCG@v0.1	/models/dna_r9.4.1_e8_sup@v3.3_5mCG@v0.1
+0.7.1_dna_r9.4.1_e8_sup@v3.3_5mCG_5hmCG@v0	0.7.1	dna_r9.4.1_e8_sup@v3.3_5mCG_5hmCG@v0	/models/dna_r9.4.1_e8_sup@v3.3_5mCG_5hmCG@v0
+0.7.1_dna_r9.4.1_e8_sup@v3.6	0.7.1	dna_r9.4.1_e8_sup@v3.6	/models/dna_r9.4.1_e8_sup@v3.6
+0.7.1_rna002_70bps_fast@v3	0.7.1	rna002_70bps_fast@v3	/models/rna002_70bps_fast@v3
+0.7.1_rna002_70bps_hac@v3	0.7.1	rna002_70bps_hac@v3	/models/rna002_70bps_hac@v3
+0.7.1_rna004_130bps_fast@v3.0.1	0.7.1	rna004_130bps_fast@v3.0.1	/models/rna004_130bps_fast@v3.0.1
+0.7.1_rna004_130bps_fast@v5.0.0	0.7.1	rna004_130bps_fast@v5.0.0	/models/rna004_130bps_fast@v5.0.0
+0.7.1_rna004_130bps_hac@v3.0.1	0.7.1	rna004_130bps_hac@v3.0.1	/models/rna004_130bps_hac@v3.0.1
+0.7.1_rna004_130bps_hac@v5.0.0	0.7.1	rna004_130bps_hac@v5.0.0	/models/rna004_130bps_hac@v5.0.0
+0.7.1_rna004_130bps_hac@v5.0.0_m6A@v1	0.7.1	rna004_130bps_hac@v5.0.0_m6A@v1	/models/rna004_130bps_hac@v5.0.0_m6A@v1
+0.7.1_rna004_130bps_hac@v5.0.0_pseU@v1	0.7.1	rna004_130bps_hac@v5.0.0_pseU@v1	/models/rna004_130bps_hac@v5.0.0_pseU@v1
+0.7.1_rna004_130bps_sup@v3.0.1	0.7.1	rna004_130bps_sup@v3.0.1	/models/rna004_130bps_sup@v3.0.1
+0.7.1_rna004_130bps_sup@v3.0.1_m6A_DRACH@v1	0.7.1	rna004_130bps_sup@v3.0.1_m6A_DRACH@v1	/models/rna004_130bps_sup@v3.0.1_m6A_DRACH@v1
+0.7.1_rna004_130bps_sup@v5.0.0	0.7.1	rna004_130bps_sup@v5.0.0	/models/rna004_130bps_sup@v5.0.0
+0.7.1_rna004_130bps_sup@v5.0.0_m6A@v1	0.7.1	rna004_130bps_sup@v5.0.0_m6A@v1	/models/rna004_130bps_sup@v5.0.0_m6A@v1
+0.7.1_rna004_130bps_sup@v5.0.0_pseU@v1	0.7.1	rna004_130bps_sup@v5.0.0_pseU@v1	/models/rna004_130bps_sup@v5.0.0_pseU@v1
diff --git a/tools/dorado/tool_data_table_conf.xml.sample b/tools/dorado/tool_data_table_conf.xml.sample
index d766a72f..ad53c64a 100644
--- a/tools/dorado/tool_data_table_conf.xml.sample
+++ b/tools/dorado/tool_data_table_conf.xml.sample
@@ -1,6 +1,6 @@
 <tables>
     <table name="dorado_models" comment_char="#">
-        <columns>value, name, path</columns>
+        <columns>value, tool_version, name, path</columns>
         <file path="tool-data/dorado_models.loc" />
     </table>
 </tables>
\ No newline at end of file
diff --git a/tools/dorado/tool_data_table_conf.xml.test b/tools/dorado/tool_data_table_conf.xml.test
index 049af265..27816e66 100644
--- a/tools/dorado/tool_data_table_conf.xml.test
+++ b/tools/dorado/tool_data_table_conf.xml.test
@@ -1,6 +1,6 @@
 <tables>
     <table name="dorado_models" comment_char="#">
-        <columns>value, name, path</columns>
+        <columns>value, tool_version, name, path</columns>
         <file path="${__HERE__}/test-data/dorado_models.loc" />
     </table>
 </tables>
\ No newline at end of file