diff --git a/lib/analytics.dart b/lib/analytics.dart
index 7d129f1c..e585f78f 100644
--- a/lib/analytics.dart
+++ b/lib/analytics.dart
@@ -59,7 +59,7 @@ class Analytics {
 
   Future<void> logEvent({
     @required String name,
-    Map<String, dynamic> parameters,
+    Map<String, String> parameters,
   }) async {
     await firebase.logEvent(name: name, parameters: parameters);
     captureErrorBreadcrumb(name: name, parameters: parameters);
@@ -67,7 +67,7 @@ class Analytics {
 
   Future<void> log({
     @required Event e,
-    Map<String, dynamic> parameters,
+    Map<String, String> parameters,
   }) async {
     String name = _eventToString(e);
     await firebase.logEvent(name: name, parameters: parameters);
@@ -80,6 +80,6 @@ class Analytics {
   }
 }
 
-void logEvent(Event event, {Map<String, dynamic> parameters}) {
+void logEvent(Event event, {Map<String, String> parameters}) {
   getAnalytics().log(e: event, parameters: parameters);
 }
diff --git a/lib/error_reporting.dart b/lib/error_reporting.dart
index 1efaef6b..bcfa3e34 100644
--- a/lib/error_reporting.dart
+++ b/lib/error_reporting.dart
@@ -113,7 +113,7 @@ List<Breadcrumb> breadcrumbs = [];
 
 void captureErrorBreadcrumb({
   @required String name,
-  Map<String, dynamic> parameters,
+  Map<String, String> parameters,
 }) {
   var b = Breadcrumb(name, DateTime.now(), data: parameters);
   breadcrumbs.add(b);
diff --git a/lib/setup/autoconfigure.dart b/lib/setup/autoconfigure.dart
index f7ff8bab..b8339db8 100644
--- a/lib/setup/autoconfigure.dart
+++ b/lib/setup/autoconfigure.dart
@@ -117,7 +117,7 @@ class GitHostSetupAutoConfigureState extends State<GitHostSetupAutoConfigure> {
       errorMessage = widget.gitHostType.toString() + ": " + e.toString();
       getAnalytics().logEvent(
         name: "githostsetup_error",
-        parameters: <String, dynamic>{
+        parameters: <String, String>{
           'errorMessage': errorMessage,
         },
       );
diff --git a/lib/setup/button.dart b/lib/setup/button.dart
index 6532cada..c4c3085a 100644
--- a/lib/setup/button.dart
+++ b/lib/setup/button.dart
@@ -50,7 +50,7 @@ class GitHostSetupButton extends StatelessWidget {
     Log.d("githostsetup_button_click " + text);
     getAnalytics().logEvent(
       name: "githostsetup_button_click",
-      parameters: <String, dynamic>{
+      parameters: <String, String>{
         'text': text,
         'icon_url': iconUrl == null ? "" : iconUrl,
       },
diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index a1b6b4db..0968b416 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -457,7 +457,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
       setState(() {
         getAnalytics().logEvent(
           name: "onboarding_gitClone_error",
-          parameters: <String, dynamic>{
+          parameters: <String, String>{
             'error': error,
           },
         );
@@ -492,8 +492,8 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
     widget.onCompletedFunction();
   }
 
-  Map<String, dynamic> _buildOnboardingAnalytics() {
-    var map = <String, dynamic>{};
+  Map<String, String> _buildOnboardingAnalytics() {
+    var map = <String, String>{};
 
     if (_gitCloneUrl.contains("github.com")) {
       map["host_type"] = "GitHub";