diff --git a/.github/workflows/java_master_only.yml b/.github/workflows/java_master_only.yml
index 95ebfe958e2..2775f500f32 100644
--- a/.github/workflows/java_master_only.yml
+++ b/.github/workflows/java_master_only.yml
@@ -124,6 +124,7 @@ jobs:
         with:
           path: ${{ steps.uv-cache.outputs.dir }}
           key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
+
       - name: Install Python dependencies
         run: make install-python-ci-dependencies-uv
       - uses: actions/cache@v4
diff --git a/java/serving/src/main/java/feast/serving/service/config/RegistryConfigModule.java b/java/serving/src/main/java/feast/serving/service/config/RegistryConfigModule.java
index 5ab951c71cb..6a9c03956c4 100644
--- a/java/serving/src/main/java/feast/serving/service/config/RegistryConfigModule.java
+++ b/java/serving/src/main/java/feast/serving/service/config/RegistryConfigModule.java
@@ -41,9 +41,14 @@ Storage googleStorage(ApplicationProperties applicationProperties) {
 
   @Provides
   public AmazonS3 awsStorage(ApplicationProperties applicationProperties) {
-    return AmazonS3ClientBuilder.standard()
-        .withRegion(applicationProperties.getFeast().getAwsRegion())
-        .build();
+    AmazonS3ClientBuilder builder = AmazonS3ClientBuilder.standard();
+    String region = applicationProperties.getFeast().getAwsRegion();
+
+    if (region != null) {
+      builder = builder.withRegion(region);
+    }
+
+    return builder.build();
   }
 
   @Provides
diff --git a/java/serving/src/test/resources/docker-compose/feast10/Dockerfile b/java/serving/src/test/resources/docker-compose/feast10/Dockerfile
index 94b3e708ddf..09a8d23faef 100644
--- a/java/serving/src/test/resources/docker-compose/feast10/Dockerfile
+++ b/java/serving/src/test/resources/docker-compose/feast10/Dockerfile
@@ -1,13 +1,16 @@
 FROM python:3.11
 
 WORKDIR /app
-COPY java/serving/src/test/resources/docker-compose/feast10/ .
 COPY sdk/python /mnt/feast/sdk/python
 COPY protos /mnt/feast/protos
 COPY setup.py /mnt/feast/setup.py
 COPY pyproject.toml /mnt/feast/pyproject.toml
 COPY README.md /mnt/feast/README.md
-RUN cd /mnt/feast && SETUPTOOLS_SCM_PRETEND_VERSION="0.1.0" pip install .[grpcio,redis]
+COPY Makefile /mnt/feast/Makefile
+ENV SETUPTOOLS_SCM_PRETEND_VERSION=0.1.0
+RUN pip install uv
+RUN cd /mnt/feast && uv pip install --system .[grpcio,redis]
+COPY java/serving/src/test/resources/docker-compose/feast10/ .
 EXPOSE 8080
 
 CMD ["./entrypoint.sh"]