diff --git a/rowers/tasks.py b/rowers/tasks.py
index 25f2a03d..f767a22e 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -3354,8 +3354,8 @@ def handle_rp3_async_workout(userid, rp3token, rp3id, startdatetime, max_attempt
         'secret': UPLOAD_SERVICE_SECRET,
         'user': userid,
         'file': filename,
-        'workouttype': 'dynamic',
-        'boattype': '1x',
+        'workouttype': 'rower',
+        'boattype': 'rp3',
         'rp3id': int(rp3id),
         'startdatetime': startdatetime,
         'timezone': timezone,
@@ -3552,7 +3552,12 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec,
         # rest_time = 0
     distance = distance+rest_distance
     c2id = data['id']
-    workouttype = data['type']
+    if data['type'] in ['rower','dynamic','slides']:
+        workouttype = 'rower'
+        boattype = data['type']
+    else:
+        workouttype = data['type']
+        boattype = '1x'
     # verified = data['verified']
 
     # weightclass = data['weight_class']
@@ -3696,7 +3701,7 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec,
         'file': csvfilename,
         'title': title,
         'workouttype': workouttype,
-        'boattype': '1x',
+        'boattype': boattype,
         'c2id': c2id,
         'startdatetime': startdatetime.isoformat(),
         'timezone': str(timezone)
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index fa563b7b..b9bb34fe 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ