diff --git a/.env b/.env
index 959b1bfc..bb9f63ab 100644
--- a/.env
+++ b/.env
@@ -39,14 +39,12 @@ ARCH_ALIAS=x86_64
 ARCH_SHORT=amd64
 
 # Default repository to pull and push images from
-REPO=apache/arrow-dev
+REPO=ghcr.io/apache/arrow-java-dev
 
 # The setup attempts to generate coredumps by default, in order to disable the
 # coredump generation set it to 0
 ULIMIT_CORE=-1
 
-# Default versions for platforms
-
 # Default versions for various dependencies
 JDK=11
 MAVEN=3.9.6
diff --git a/.github/workflows/java.yml b/.github/workflows/test.yml
similarity index 90%
rename from .github/workflows/java.yml
rename to .github/workflows/test.yml
index 7bcda560..b47404ee 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/test.yml
@@ -61,10 +61,11 @@ jobs:
         uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: .docker
-          key: maven-${{ hashFiles('java/**') }}
-          restore-keys: maven-
+          key: maven-${{ matrix.jdk }}-${{ matrix.maven }}-${{ hashFiles('**/docker-compose.yml') }}
+          restore-keys: maven-${{ matrix.jdk }}-${{ matrix.maven }}-
       - name: Execute Docker Build
         env:
+          # Enables build caching, but not strictly required
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           docker compose run \
diff --git a/arrow-format/README.rst b/arrow-format/README.rst
index 0eaad49b..7354d634 100644
--- a/arrow-format/README.rst
+++ b/arrow-format/README.rst
@@ -15,11 +15,5 @@
 .. specific language governing permissions and limitations
 .. under the License.
 
-Arrow Protocol Files
-====================
-
-This folder contains binary protocol definitions for the Arrow columnar format
-and other parts of the project, like the Flight RPC framework.
-
-For documentation about the Arrow format, see the `docs/source/format`
-directory.
+This is a copy of https://github.com/apache/arrow/tree/main/format at revision
+2e6fe1a4ccfc4ffc63e5d0dc09f972ebbca12426.