diff --git a/.github/workflows/joshua.yml b/.github/workflows/joshua.yml
index ac61a35..b3a8ce6 100644
--- a/.github/workflows/joshua.yml
+++ b/.github/workflows/joshua.yml
@@ -16,10 +16,10 @@ jobs:
       - name: Install fdb and dependencies
         run: |
           sudo mkdir -p /var/lib/foundationdb/data
-          wget https://github.com/apple/foundationdb/releases/download/6.3.18/foundationdb-clients_6.3.18-1_amd64.deb
-          wget https://github.com/apple/foundationdb/releases/download/6.3.18/foundationdb-server_6.3.18-1_amd64.deb
-          echo "d18ad92f081827e723fe1e554948a587a0b6069f95f050564821b3ecdb8b4daf  foundationdb-clients_6.3.18-1_amd64.deb" >> checks.txt
-          echo "d5e452b71f85d6e5d16a2d707b8699a4ae1addeaaa456f002007b81d30bb39bf  foundationdb-server_6.3.18-1_amd64.deb" >> checks.txt
+          wget https://github.com/apple/foundationdb/releases/download/7.1.57/foundationdb-clients_7.1.57-1_amd64.deb
+          wget https://github.com/apple/foundationdb/releases/download/7.1.57/foundationdb-server_7.1.57-1_amd64.deb
+          echo "c5bd7c7a6ee4a3bacb9127ba53aa0d16700c987e2dbc7931c0441b8c5f1a01b6  foundationdb-clients_7.1.57-1_amd64.deb" >> checks.txt
+          echo "a4ffc466f266d4b53c972b73914bf2d13cc07cbdb817c6d3d9c529cc134990ba  foundationdb-server_7.1.57-1_amd64.deb" >> checks.txt
           sha256sum -c checks.txt && sudo dpkg -i *.deb
           sudo pip3 install -r test-requirements.txt
 
diff --git a/k8s/agent-scaler/Dockerfile b/k8s/agent-scaler/Dockerfile
index 75e825f..00fba60 100644
--- a/k8s/agent-scaler/Dockerfile
+++ b/k8s/agent-scaler/Dockerfile
@@ -47,6 +47,7 @@ ENV CHECK_DELAY=10
 ENV AGENT_TIMEOUT=300
 ENV AGENT_TAG=${AGENT_TAG}
 ENV NAMESPACE=joshua
+ENV AGENT_NAME=joshua-agent
 
 # Entry point
 ENTRYPOINT /tools/agent-scaler.sh
diff --git a/k8s/agent-scaler/agent-scaler.sh b/k8s/agent-scaler/agent-scaler.sh
index c8e0e88..cffe35c 100755
--- a/k8s/agent-scaler/agent-scaler.sh
+++ b/k8s/agent-scaler/agent-scaler.sh
@@ -24,7 +24,7 @@ while true; do
 
     if [ $use_k8s_ttl_controller == false ] ; then
       # cleanup finished jobs (status 1/1)
-      for job in $(kubectl get jobs -n "${namespace}" --no-headers | grep -E -e 'joshua-agent-[0-9-]*\s*1/1' | awk '{print $1}'); do
+      for job in $(kubectl get jobs -n "${namespace}" --no-headers | grep -E -e "${AGENT_NAME}" | awk '{if ($2 == "Complete") { print $1; } }'); do
           echo "=== Job $job Completed ==="
           kubectl delete job "$job" -n "${namespace}"
       done
diff --git a/test-requirements.txt b/test-requirements.txt
index f06a9f2..99d618e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
 attrs==22.1.0
-foundationdb==6.3.18
+foundationdb==7.1.57
 importlib-metadata==5.0.0
 iniconfig==1.1.1
 lxml==4.9.1