diff --git a/Cargo.lock b/Cargo.lock
index c606bed85c..0a1fe54aab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7870,7 +7870,7 @@ dependencies = [
 
 [[package]]
 name = "nym-node-status-agent"
-version = "2.0.1-rc3"
+version = "2.0.1"
 dependencies = [
  "anyhow",
  "clap",
@@ -7891,7 +7891,7 @@ dependencies = [
 
 [[package]]
 name = "nym-node-status-api"
-version = "4.6.2-rc10"
+version = "4.6.2"
 dependencies = [
  "ammonia",
  "anyhow",
diff --git a/nym-node-status-api/nym-node-status-api/.sqlx/query-2e825cb61d34ed7b41d622743b4528594a84f560130a6956507ef8c4500e4bb9.json b/nym-node-status-api/nym-node-status-api/.sqlx/query-2e825cb61d34ed7b41d622743b4528594a84f560130a6956507ef8c4500e4bb9.json
new file mode 100644
index 0000000000..2a8239cd82
--- /dev/null
+++ b/nym-node-status-api/nym-node-status-api/.sqlx/query-2e825cb61d34ed7b41d622743b4528594a84f560130a6956507ef8c4500e4bb9.json
@@ -0,0 +1,31 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        WITH oldest_queued AS (\n            SELECT testruns.id\n            FROM testruns\n            JOIN gateways ON gateways.id = testruns.gateway_id\n            WHERE testruns.status = $1\n              AND testruns.kind = $4\n              AND gateways.bonded = true\n              AND gateways.performance > 0\n            ORDER BY testruns.created_utc asc\n            LIMIT 1\n            FOR UPDATE OF testruns SKIP LOCKED\n        )\n        UPDATE testruns\n            SET\n                status = $3,\n                last_assigned_utc = $2\n            FROM oldest_queued\n            WHERE testruns.id = oldest_queued.id\n        RETURNING\n            testruns.id,\n            testruns.gateway_id\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "gateway_id",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Int8",
+        "Int4",
+        "Int2"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "2e825cb61d34ed7b41d622743b4528594a84f560130a6956507ef8c4500e4bb9"
+}
diff --git a/nym-node-status-api/nym-node-status-api/.sqlx/query-62be5c3a94e6b2e72823e0fe6d26b5ac23f7f7eabc6b2ba13ccfb8ef14fcfd30.json b/nym-node-status-api/nym-node-status-api/.sqlx/query-62be5c3a94e6b2e72823e0fe6d26b5ac23f7f7eabc6b2ba13ccfb8ef14fcfd30.json
deleted file mode 100644
index b1bc6785eb..0000000000
--- a/nym-node-status-api/nym-node-status-api/.sqlx/query-62be5c3a94e6b2e72823e0fe6d26b5ac23f7f7eabc6b2ba13ccfb8ef14fcfd30.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        WITH oldest_queued AS (\n            SELECT testruns.id\n            FROM testruns\n            JOIN gateways ON gateways.id = testruns.gateway_id\n            WHERE testruns.status = $1\n              AND gateways.bonded = true\n              AND gateways.performance > 0\n            ORDER BY testruns.created_utc asc\n            LIMIT 1\n            FOR UPDATE OF testruns SKIP LOCKED\n        )\n        UPDATE testruns\n            SET\n                status = $3,\n                last_assigned_utc = $2\n            FROM oldest_queued\n            WHERE testruns.id = oldest_queued.id\n        RETURNING\n            testruns.id,\n            testruns.gateway_id\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "gateway_id",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Int8",
-        "Int4"
-      ]
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "62be5c3a94e6b2e72823e0fe6d26b5ac23f7f7eabc6b2ba13ccfb8ef14fcfd30"
-}
diff --git a/nym-node-status-api/nym-node-status-api/src/db/queries/testruns.rs b/nym-node-status-api/nym-node-status-api/src/db/queries/testruns.rs
index bc2719cea6..fa7d726389 100644
--- a/nym-node-status-api/nym-node-status-api/src/db/queries/testruns.rs
+++ b/nym-node-status-api/nym-node-status-api/src/db/queries/testruns.rs
@@ -117,6 +117,7 @@ async fn assign_oldest_testrun_by_kind(
             FROM testruns
             JOIN gateways ON gateways.id = testruns.gateway_id
             WHERE testruns.status = $1
+              AND testruns.kind = $4
               AND gateways.bonded = true
               AND gateways.performance > 0
             ORDER BY testruns.created_utc asc
diff --git a/nym-node-status-api/nym-node-status-api/src/http/api/testruns.rs b/nym-node-status-api/nym-node-status-api/src/http/api/testruns.rs
index aa706d161c..add6ab2f1d 100644
--- a/nym-node-status-api/nym-node-status-api/src/http/api/testruns.rs
+++ b/nym-node-status-api/nym-node-status-api/src/http/api/testruns.rs
@@ -32,10 +32,10 @@ pub(crate) fn routes() -> Router<AppState> {
             "/ports-check",
             axum::routing::get(request_ports_check_testrun),
         )
-        .route("/:testrun_id", axum::routing::post(submit_testrun))
-        .route("/:testrun_id/v2", axum::routing::post(submit_testrun_v2))
+        .route("/{testrun_id}", axum::routing::post(submit_testrun))
+        .route("/{testrun_id}/v2", axum::routing::post(submit_testrun_v2))
         .route(
-            "/:testrun_id/ports-check/v2",
+            "/{testrun_id}/ports-check/v2",
             axum::routing::post(submit_ports_check_testrun_v2),
         )
         .layer(DefaultBodyLimit::max(1024 * 1024 * 5))