diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml
index 8e3d21f72a..a01d5bec20 100644
--- a/.github/workflows/java-cd.yml
+++ b/.github/workflows/java-cd.yml
@@ -71,6 +71,16 @@ jobs:
 
         runs-on: ${{ matrix.host.RUNNER }}
         steps:
+            - name: Start Valkey server
+              run: |
+                if ${{ matrix.host.OS }} == ubuntu; then
+                    apt-get install valkey
+                    systemctl start valkey
+                else
+                  brew install valkey
+                  brew services start valkey
+                fi
+
             - uses: actions/checkout@v4
               with:
                   submodules: recursive
@@ -94,16 +104,6 @@ jobs:
                   version: "26.1"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Start Valkey server
-              run: |
-                  if ${{ matrix.host.OS }} == 'ubuntu'; then
-                      apt-get install valkey
-                      systemctl start valkey
-                  else
-                    brew install valkey
-                    brew services start valkey
-                  fi
-
             - name: Test deployment
               working-directory: java
               run: |
@@ -115,7 +115,7 @@ jobs:
                   if ${{ matrix.host.OS }} == 'ubuntu'; then
                       systemctl stop valkey
                   else
-                      brew systemctl stop valkey
+                      brew services stop valkey
                   fi
 
 #