diff --git a/firebase_admin/ml.py b/firebase_admin/ml.py
index 900fdc24b..2613a3de3 100644
--- a/firebase_admin/ml.py
+++ b/firebase_admin/ml.py
@@ -49,8 +49,8 @@
 _ML_ATTRIBUTE = '_ml'
 _MAX_PAGE_SIZE = 100
 _MODEL_ID_PATTERN = re.compile(r'^[A-Za-z0-9_-]{1,60}$')
-_DISPLAY_NAME_PATTERN = re.compile(r'^[A-Za-z0-9_-]{1,60}$')
-_TAG_PATTERN = re.compile(r'^[A-Za-z0-9_-]{1,60}$')
+_DISPLAY_NAME_PATTERN = re.compile(r'^[A-Za-z0-9_-]{1,32}$')
+_TAG_PATTERN = re.compile(r'^[A-Za-z0-9_-]{1,32}$')
 _GCS_TFLITE_URI_PATTERN = re.compile(
     r'^gs://(?P<bucket_name>[a-z0-9_.-]{3,63})/(?P<blob_name>.+)$')
 _RESOURCE_NAME_PATTERN = re.compile(
diff --git a/integration/test_ml.py b/integration/test_ml.py
index be791d8fa..1d32ebed1 100644
--- a/integration/test_ml.py
+++ b/integration/test_ml.py
@@ -42,22 +42,22 @@ def _random_identifier(prefix):
 
 
 NAME_ONLY_ARGS = {
-    'display_name': _random_identifier('TestModel123_')
+    'display_name': _random_identifier('TestModel_')
 }
 NAME_ONLY_ARGS_UPDATED = {
-    'display_name': _random_identifier('TestModel123_updated_')
+    'display_name': _random_identifier('TestModel_updated_')
 }
 NAME_AND_TAGS_ARGS = {
-    'display_name': _random_identifier('TestModel123_tags_'),
+    'display_name': _random_identifier('TestModel_tags_'),
     'tags': ['test_tag123']
 }
 FULL_MODEL_ARGS = {
-    'display_name': _random_identifier('TestModel123_full_'),
+    'display_name': _random_identifier('TestModel_full_'),
     'tags': ['test_tag567'],
     'file_name': 'model1.tflite'
 }
 INVALID_FULL_MODEL_ARGS = {
-    'display_name': _random_identifier('TestModel123_invalid_full_'),
+    'display_name': _random_identifier('TestModel_invalid_full_'),
     'tags': ['test_tag890'],
     'file_name': 'invalid_model.tflite'
 }