diff --git a/modules/material/themes/material/default/selectidp-links.twig b/modules/material/themes/material/default/selectidp-links.twig
index 83af8f9..9381e88 100644
--- a/modules/material/themes/material/default/selectidp-links.twig
+++ b/modules/material/themes/material/default/selectidp-links.twig
@@ -36,7 +36,11 @@
 
     function clickedAnyway(idpName) {
       {% if analytics_tracking_id is not empty %}
-        ga('send', 'event', 'hub', 'choice-disabled', 'IdP', idpName);
+        gtag('event', 'IdP', {
+          'event_category': 'hub',
+          'event_label': 'choice',
+          'value': id
+        });
       {% endif %}
     }
   </script>
diff --git a/modules/material/themes/material/mfa/new-backup-codes.twig b/modules/material/themes/material/mfa/new-backup-codes.twig
index 12dd59d..c80b378 100644
--- a/modules/material/themes/material/mfa/new-backup-codes.twig
+++ b/modules/material/themes/material/mfa/new-backup-codes.twig
@@ -138,7 +138,10 @@
 
         {% if analytics_tracking_id is not empty %}
           <script>
-            ga('send', 'event', 'error', 'backupcode', 'generation-failed');
+            gtag('event', 'generation-failed', {
+              'event_category': 'error',
+              'event_label': 'backupcode'
+            });
           </script>
         {% endif %}
       {% endif %}
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig b/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig
index a275153..fcbf169 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig
@@ -55,7 +55,10 @@
 
           {% if analytics_tracking_id is not empty %}
             <script>
-              ga('send', 'event', 'error', 'backupcode', '{{ error_message|e('js')|raw }}');
+              gtag('event', '{{ error_message|e('js')|raw }}', {
+                'event_category': 'error',
+                'event_label': 'backupcode'
+              });
             </script>
           {% endif %}
         {% endif %}
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
index d7ab56a..ec6d08b 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
@@ -55,7 +55,10 @@
 
           {% if analytics_tracking_id is not empty %}
             <script>
-              ga('send', 'event', 'error', 'managercode', '{{ error_message|e('js')|raw }}');
+              gtag('event', '{{ error_message|e('js')|raw }}', {
+                'event_category': 'error',
+                'event_label': 'managercode'
+              });
             </script>
           {% endif %}
         {% endif %}
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig b/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
index d8dd51c..c159c9d 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
@@ -53,7 +53,10 @@
 
           {% if analytics_tracking_id is not empty %}
             <script>
-              ga('send', 'event', 'error', 'totp', '{{ error_message|e('js')|raw }}');
+              gtag('event', '{{ error_message|e('js')|raw }}', {
+                'event_category': 'error',
+                'event_label': 'totp'
+              });
             </script>
           {% endif %}
         {% endif %}
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig b/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
index 61370b2..b22da50 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
@@ -96,7 +96,10 @@
 
         {% if error_message is not empty and analytics_tracking_id is not empty %}
           <script>
-            ga('send', 'event', 'error', 'webauthn', '{{ error_message|e('js')|raw }}');
+           gtag('event', '{{ error_message|e('js')|raw }}', {
+            'event_category': 'error',
+            'event_label': 'webauthn'
+          });
           </script>
         {% endif %}
         <div class="mdl-card__supporting-text" layout-children="column">
diff --git a/modules/material/themes/material/silauth/loginuserpass.twig b/modules/material/themes/material/silauth/loginuserpass.twig
index bfafb71..ed95df6 100644
--- a/modules/material/themes/material/silauth/loginuserpass.twig
+++ b/modules/material/themes/material/silauth/loginuserpass.twig
@@ -29,7 +29,9 @@
       }
 
       {% if analytics_tracking_id is not empty %}
-        ga('send', 'event', 'reCAPTCHA', 'required');
+        gtag('event', 'required', {
+          'event_category': 'reCAPTCHA'
+        });
       {% endif %}
     </script>
   {% endif %}
@@ -104,7 +106,11 @@
 
           {% if analytics_tracking_id is not empty %}
             <script>
-              ga('send', 'event', 'error', '{{ errorcode|e('js') }}', 'message', '{{ message|e('js') }}');
+              gtag('event', '{{ errorcode|e('js') }}', {
+                'event_category': 'error',
+                'event_label': 'message',
+                'value': '{{ message|e('js') }}'
+              });
             </script>
           {% endif %}
         {% endif %}