diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
index 93cc561..4fc7460 100644
--- a/.github/workflows/make.yml
+++ b/.github/workflows/make.yml
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
       - if: matrix.router == 'nxroute-poc'
         uses: actions/setup-python@v5
diff --git a/.github/workflows/scoring_criteria.yml b/.github/workflows/scoring_criteria.yml
index af0c34b..a7cf4f4 100644
--- a/.github/workflows/scoring_criteria.yml
+++ b/.github/workflows/scoring_criteria.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: '3.12'
           check-latest: true
-          #cache: 'pip'
+          cache: 'pip'
       - run: |
           cd scoring_formula
           python3 -m unittest test_scoring_formula.py -v
diff --git a/Makefile b/Makefile
index 9526ed2..ea5bb3f 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ compile-java:
 	_JAVA_OPTIONS="$(JAVA_PROXY)" ./gradlew compileJava
 	_JAVA_OPTIONS="$(JAVA_PROXY)" RapidWright/bin/rapidwright Jython -c "FileTools.ensureDataFilesAreStaticInstallFriendly('xcvu3p')"
 install-python-deps:
-	pip install -q -r requirements.txt --pre --user
+	python3 -m pip install -q -r requirements.txt --pre --user
 else
 compile-java install-python-deps:
 	@echo "$@ target skipped since network disabled inside apptainer"
diff --git a/RapidWright b/RapidWright
index 425d89e..fc0f599 160000
--- a/RapidWright
+++ b/RapidWright
@@ -1 +1 @@
-Subproject commit 425d89e28cce0df648e2236a950efd035450438c
+Subproject commit fc0f5991ddcc85d9af3dd6ed4d5c0eff9bfef683
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fc..5c82cb0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/networkx-proof-of-concept-router/nxroute-poc.py b/networkx-proof-of-concept-router/nxroute-poc.py
index f6f7262..7f550902 100644
--- a/networkx-proof-of-concept-router/nxroute-poc.py
+++ b/networkx-proof-of-concept-router/nxroute-poc.py
@@ -60,11 +60,11 @@ class NxRoutingGraph(nx.DiGraph):
         to graph node and edge to PIP lookups.
         """
 
-        # Clock Region X2Y1 (requires ~5GB RAM)
+        # Clock Region X2Y1:X4Y3 (requires <16GB RAM)
         MIN_X = 36
-        MAX_X = 56
+        MAX_X = 90
         MIN_Y = 60
-        MAX_Y = 119
+        MAX_Y = 239
 
         # Entire device (requires ~50GB RAM)
         # MIN_X = 0