diff --git a/core/services/ardupilot_manager/mavlink_proxy/test_all.py b/core/services/ardupilot_manager/mavlink_proxy/test_all.py
index bfc1e6bed8..84a7487de8 100644
--- a/core/services/ardupilot_manager/mavlink_proxy/test_all.py
+++ b/core/services/ardupilot_manager/mavlink_proxy/test_all.py
@@ -337,7 +337,8 @@ async def serial_test_mavlink_server(
     mavlink_server = MAVLinkServer()
     mavlink_server.log_path = "./logs"
     assert mavlink_server.name() == "MAVLink-Server", "Name does not match."
-    assert re.search(r"\d+.\d+.\d+", str(mavlink_server.version())) is not None, "Version does not follow pattern."
+    # Experimental tags (e.g. wip4d) are not semver; still require a non-empty version string.
+    assert mavlink_server.version(), "Version is missing."
 
     allowed_output_types = [
         EndpointType.UDPServer,
diff --git a/core/tools/mavlink_server/bootstrap.sh b/core/tools/mavlink_server/bootstrap.sh
index f29be93038..e726bff745 100755
--- a/core/tools/mavlink_server/bootstrap.sh
+++ b/core/tools/mavlink_server/bootstrap.sh
@@ -3,9 +3,9 @@
 # Immediately exit on errors
 set -e
 
-VERSION="0.9.0"
+VERSION="wip4d"
 PROJECT_NAME="mavlink-server"
-REPOSITORY_ORG="bluerobotics"
+REPOSITORY_ORG="joaoantoniocardoso"
 REPOSITORY_NAME="$PROJECT_NAME"
 REPOSITORY_URL="https://github.com/$REPOSITORY_ORG/$REPOSITORY_NAME"
 
diff --git a/core/tools/recorder/bootstrap.sh b/core/tools/recorder/bootstrap.sh
index 49fcd869c0..33e47328e8 100755
--- a/core/tools/recorder/bootstrap.sh
+++ b/core/tools/recorder/bootstrap.sh
@@ -3,9 +3,9 @@
 # Immediately exit on errors
 set -e
 
-VERSION="0.0.5"
+VERSION="camera_recording_gate"
 PROJECT_NAME="blueos-recorder"
-REPOSITORY_ORG="bluerobotics"
+REPOSITORY_ORG="joaoantoniocardoso"
 REPOSITORY_NAME="$PROJECT_NAME"
 REPOSITORY_URL="https://github.com/$REPOSITORY_ORG/$REPOSITORY_NAME"