diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml
index 6cae1aa77cb..88f3140f05d 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml
@@ -1,6 +1,8 @@
 # This directory has its own qlpack for reasons detailed in commit 2550788598010fa2117274607c9d58f64f997f34
-name: codeql-cpp-tests-cwe-190-tainted
+name: codeql/cpp-tests-cwe-190-tainted
 version: 0.0.0
-libraryPathDependencies: codeql-cpp
+libraryPathDependencies:
+  - codeql/cpp-all
+  - codeql/cpp-queries
 extractor: cpp
 tests: .
diff --git a/csharp/ql/examples/qlpack.yml b/csharp/ql/examples/qlpack.yml
index f7b585db963..980429f12ed 100644
--- a/csharp/ql/examples/qlpack.yml
+++ b/csharp/ql/examples/qlpack.yml
@@ -1,3 +1,4 @@
 name: codeql-csharp-examples
 version: 0.0.0
-libraryPathDependencies: codeql-csharp
+dependencies:
+  codeql/csharp-all: 0.0.1
diff --git a/misc/legacy-support/cpp/qlpack.yml b/misc/legacy-support/cpp/qlpack.yml
index 02970174477..5edcb10726e 100644
--- a/misc/legacy-support/cpp/qlpack.yml
+++ b/misc/legacy-support/cpp/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-cpp
 version: 0.0.0
 libraryPathDependencies:
-  - codeql-cpp
+  - codeql/cpp-all
+  - codeql/cpp-queries
diff --git a/misc/legacy-support/csharp/qlpack.yml b/misc/legacy-support/csharp/qlpack.yml
index cdf625d6040..6c9a5c062f8 100644
--- a/misc/legacy-support/csharp/qlpack.yml
+++ b/misc/legacy-support/csharp/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-csharp
 version: 0.0.0
 libraryPathDependencies:
-  - codeql-csharp
+  - codeql/csharp-all
+  - codeql/csharp-queries
diff --git a/misc/legacy-support/java/qlpack.yml b/misc/legacy-support/java/qlpack.yml
index 0773c30c9f9..cf736668b7e 100644
--- a/misc/legacy-support/java/qlpack.yml
+++ b/misc/legacy-support/java/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-java
 version: 0.0.0
 libraryPathDependencies:
-  - codeql-java
+  - codeql/java-all
+  - codeql/java-queries
diff --git a/misc/legacy-support/javascript/qlpack.yml b/misc/legacy-support/javascript/qlpack.yml
index 10538777ccc..eb55413bd57 100644
--- a/misc/legacy-support/javascript/qlpack.yml
+++ b/misc/legacy-support/javascript/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-javascript
 version: 0.0.0
 libraryPathDependencies:
-  - codeql-javascript
+  - codeql/javascript-all
+  - codeql/javascript-queries
diff --git a/misc/legacy-support/python/qlpack.yml b/misc/legacy-support/python/qlpack.yml
index 59d9dba8499..da8947a73e0 100644
--- a/misc/legacy-support/python/qlpack.yml
+++ b/misc/legacy-support/python/qlpack.yml
@@ -1,4 +1,5 @@
 name: legacy-libraries-python
 version: 0.0.0
 libraryPathDependencies:
-  - codeql-python
+  - codeql/python-all
+  - codeql/python-queries
diff --git a/python/tools/recorded-call-graph-metrics/ql/qlpack.yml b/python/tools/recorded-call-graph-metrics/ql/qlpack.yml
index 1b4b6c0ca8c..67c3ef81d61 100644
--- a/python/tools/recorded-call-graph-metrics/ql/qlpack.yml
+++ b/python/tools/recorded-call-graph-metrics/ql/qlpack.yml
@@ -1,4 +1,6 @@
 name: codeql-python-recorded-call-graph-metrics
 version: 0.0.1
-libraryPathDependencies: codeql-python
+libraryPathDependencies:
+  - codeql/python-all
+  - codeql/python-queries
 extractor: python