diff --git a/redis-om-spring/src/main/java/com/redis/om/spring/metamodel/MetamodelGenerator.java b/redis-om-spring/src/main/java/com/redis/om/spring/metamodel/MetamodelGenerator.java
index a1d42792..f13c9359 100644
--- a/redis-om-spring/src/main/java/com/redis/om/spring/metamodel/MetamodelGenerator.java
+++ b/redis-om-spring/src/main/java/com/redis/om/spring/metamodel/MetamodelGenerator.java
@@ -494,7 +494,7 @@ else if (Map.class.isAssignableFrom(targetCls)) {
             // Generate the special VALUES field for querying map values
             if (valuesInterceptor != null) {
               String mapFieldName = field.getSimpleName().toString();
-              String mapValuesFieldName = mapFieldName.toUpperCase().replace("_", "") + "_VALUES";
+              String mapValuesFieldName = mapFieldName.toUpperCase(Locale.ROOT).replace("_", "") + "_VALUES";
 
               // Add the VALUES field as a special metamodel field
               Triple<ObjectGraphFieldSpec, FieldSpec, CodeBlock> valuesField = generateMapValuesFieldMetamodel(entity,
@@ -518,8 +518,8 @@ else if (Map.class.isAssignableFrom(targetCls)) {
                   if (subfieldElement.getAnnotation(com.redis.om.spring.annotations.Indexed.class) != null) {
                     String subfieldName = subfieldElement.getSimpleName().toString();
                     String jsonFieldName = getJsonFieldName(subfieldElement);
-                    String nestedFieldName = field.getSimpleName().toString().toUpperCase().replace("_",
-                        "") + "_" + subfieldName.toUpperCase().replace("_", "");
+                    String nestedFieldName = field.getSimpleName().toString().toUpperCase(Locale.ROOT).replace("_",
+                        "") + "_" + subfieldName.toUpperCase(Locale.ROOT).replace("_", "");
 
                     TypeMirror subfieldTypeMirror = subfieldElement.asType();
                     String subfieldTypeName = subfieldTypeMirror.toString();
diff --git a/redis-om-spring/src/main/java/com/redis/om/spring/util/ObjectUtils.java b/redis-om-spring/src/main/java/com/redis/om/spring/util/ObjectUtils.java
index a8d2914b..d57eb319 100644
--- a/redis-om-spring/src/main/java/com/redis/om/spring/util/ObjectUtils.java
+++ b/redis-om-spring/src/main/java/com/redis/om/spring/util/ObjectUtils.java
@@ -873,7 +873,7 @@ public static String replaceIfIllegalJavaIdentifierCharacter(final String word)
    */
   public static String staticField(final String externalName) {
     requireNonNull(externalName);
-    return ObjectUtils.toUnderscoreSeparated(javaNameFromExternal(externalName)).toUpperCase();
+    return ObjectUtils.toUnderscoreSeparated(javaNameFromExternal(externalName)).toUpperCase(java.util.Locale.ROOT);
   }
 
   /**