diff --git a/redis-om-spring/src/main/java/com/redis/om/spring/RedisModulesConfiguration.java b/redis-om-spring/src/main/java/com/redis/om/spring/RedisModulesConfiguration.java
index 32e4e04b1..843fe0aea 100644
--- a/redis-om-spring/src/main/java/com/redis/om/spring/RedisModulesConfiguration.java
+++ b/redis-om-spring/src/main/java/com/redis/om/spring/RedisModulesConfiguration.java
@@ -22,7 +22,10 @@
 import org.springframework.context.annotation.*;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
+import org.springframework.core.env.Environment;
 import org.springframework.data.geo.Point;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisHash;
 import org.springframework.data.redis.core.RedisOperations;
@@ -132,6 +135,66 @@ public RedisEnhancedMappingContext redisMappingContext() {
     return new RedisEnhancedMappingContext();
   }
 
+  /**
+   * Creates a Jedis connection factory for Redis connectivity.
+   * <p>
+   * This bean is required by Redis OM Spring for Redis Stack modules support.
+   * It will be created if no JedisConnectionFactory bean exists, ensuring
+   * Jedis is used instead of Lettuce (which is Spring Boot 4.0's default).
+   * <p>
+   * Connection settings are read from standard Spring Data Redis properties:
+   * <ul>
+   * <li>{@code spring.data.redis.host} - Redis server host (default: localhost)</li>
+   * <li>{@code spring.data.redis.port} - Redis server port (default: 6379)</li>
+   * <li>{@code spring.data.redis.password} - Redis password (optional)</li>
+   * <li>{@code spring.data.redis.database} - Redis database index (default: 0)</li>
+   * </ul>
+   *
+   * @param environment the Spring environment for reading configuration properties
+   * @return the configured Jedis connection factory
+   */
+  @Bean(
+      name = "jedisConnectionFactory"
+  )
+  @Primary
+  @ConditionalOnMissingBean(
+    JedisConnectionFactory.class
+  )
+  public JedisConnectionFactory jedisConnectionFactory(Environment environment) {
+    String host = environment.getProperty("spring.data.redis.host", "localhost");
+    int port = environment.getProperty("spring.data.redis.port", Integer.class, 6379);
+    String password = environment.getProperty("spring.data.redis.password");
+    int database = environment.getProperty("spring.data.redis.database", Integer.class, 0);
+
+    RedisStandaloneConfiguration redisConfig = new RedisStandaloneConfiguration(host, port);
+    redisConfig.setDatabase(database);
+    if (password != null && !password.isEmpty()) {
+      redisConfig.setPassword(password);
+    }
+
+    JedisClientConfiguration clientConfig = JedisClientConfiguration.builder().build();
+
+    return new JedisConnectionFactory(redisConfig, clientConfig);
+  }
+
+  /**
+   * Creates a StringRedisTemplate for string-based Redis operations.
+   * <p>
+   * This bean is required by Redis OM Spring and will be created if Spring Boot's
+   * Redis autoconfiguration hasn't already created one. It uses the JedisConnectionFactory
+   * for connectivity.
+   *
+   * @param connectionFactory the Jedis connection factory
+   * @return the configured StringRedisTemplate
+   */
+  @Bean
+  @ConditionalOnMissingBean(
+    StringRedisTemplate.class
+  )
+  public StringRedisTemplate stringRedisTemplate(JedisConnectionFactory connectionFactory) {
+    return new StringRedisTemplate(connectionFactory);
+  }
+
   /**
    * Creates a configured Gson builder for JSON serialization and deserialization.
    * <p>
diff --git a/redis-om-spring/src/main/java/com/redis/om/spring/RedisRepositoriesExcludeFilter.java b/redis-om-spring/src/main/java/com/redis/om/spring/RedisRepositoriesExcludeFilter.java
index 65cdc94b6..a7dc97c75 100644
--- a/redis-om-spring/src/main/java/com/redis/om/spring/RedisRepositoriesExcludeFilter.java
+++ b/redis-om-spring/src/main/java/com/redis/om/spring/RedisRepositoriesExcludeFilter.java
@@ -33,7 +33,10 @@ public RedisRepositoriesExcludeFilter() {
   }
 
   private static final Set<String> SHOULD_SKIP = new HashSet<>(List.of(
-      "org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration"));
+      // Spring Boot 3.x class name
+      "org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration",
+      // Spring Boot 4.0+ class name (modular autoconfigure)
+      "org.springframework.boot.data.redis.autoconfigure.DataRedisRepositoriesAutoConfiguration"));
 
   @Override
   public boolean[] match(String[] autoConfigurationClasses, AutoConfigurationMetadata autoConfigurationMetadata) {
diff --git a/redis-om-spring/src/main/resources/META-INF/spring.factories b/redis-om-spring/src/main/resources/META-INF/spring.factories
index bc1f6e8e3..38e83a478 100644
--- a/redis-om-spring/src/main/resources/META-INF/spring.factories
+++ b/redis-om-spring/src/main/resources/META-INF/spring.factories
@@ -1,6 +1,6 @@
 # Auto Configure
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.redis.om.spring.RedisModulesConfiguration
+com.redis.om.spring.RedisModulesConfiguration,\
 com.redis.om.spring.EntraIDConfiguration
 org.springframework.boot.autoconfigure.AutoConfigurationImportFilter=\
 com.redis.om.spring.RedisRepositoriesExcludeFilter