diff --git a/.codeqlmanifest.json b/.codeqlmanifest.json
index 21d141d3988..c6df74dd3b5 100644
--- a/.codeqlmanifest.json
+++ b/.codeqlmanifest.json
@@ -4,7 +4,6 @@
     "ql/lib/qlpack.yml",
     "ql/examples/qlpack.yml",
     "ql/test/qlpack.yml",
-    "upgrades/qlpack.yml",
     "ql/config/legacy-support/qlpack.yml",
     "build/codeql-extractor-go/codeql-extractor.yml"
   ],
diff --git a/Makefile b/Makefile
index 3f1289bf024..7c03d6e79da 100644
--- a/Makefile
+++ b/Makefile
@@ -125,14 +125,14 @@ test: all build/testdb/check-upgrade-path
 
 .PHONY: build/testdb/check-upgrade-path
 build/testdb/check-upgrade-path : build/testdb/go.dbscheme ql/lib/go.dbscheme
-	codeql dataset upgrade build/testdb --search-path upgrades
+	codeql dataset upgrade build/testdb --search-path ql/lib
 	diff -q build/testdb/go.dbscheme ql/lib/go.dbscheme
 
 .PHONY: build/testdb/go.dbscheme
-build/testdb/go.dbscheme: upgrades/initial/go.dbscheme
+build/testdb/go.dbscheme: ql/lib/upgrades/initial/go.dbscheme
 	rm -rf build/testdb
 	echo >build/empty.trap
-	codeql dataset import -S upgrades/initial/go.dbscheme build/testdb build/empty.trap
+	codeql dataset import -S ql/lib/upgrades/initial/go.dbscheme build/testdb build/empty.trap
 
 .PHONY: sync-dataflow-libraries
 sync-dataflow-libraries:
diff --git a/ql/examples/qlpack.yml b/ql/examples/qlpack.yml
index 39eb537e673..b98541355f7 100644
--- a/ql/examples/qlpack.yml
+++ b/ql/examples/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/go-examples
 version: 0.0.2
 dependencies:
-    codeql/go-all: ^0.0.2
+    codeql/go-all: "*"
diff --git a/ql/lib/qlpack.yml b/ql/lib/qlpack.yml
index 48cebfaff12..26b6bb271ca 100644
--- a/ql/lib/qlpack.yml
+++ b/ql/lib/qlpack.yml
@@ -4,5 +4,4 @@ groups: go
 dbscheme: go.dbscheme
 extractor: go
 library: true
-dependencies:
-    codeql/go-upgrades: ~0.0.3
+upgrades: upgrades
diff --git a/upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/go.dbscheme b/ql/lib/upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/go.dbscheme
similarity index 100%
rename from upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/go.dbscheme
rename to ql/lib/upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/go.dbscheme
diff --git a/upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/old.dbscheme b/ql/lib/upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/old.dbscheme
similarity index 100%
rename from upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/old.dbscheme
rename to ql/lib/upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/old.dbscheme
diff --git a/upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/upgrade.properties b/ql/lib/upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/upgrade.properties
similarity index 100%
rename from upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/upgrade.properties
rename to ql/lib/upgrades/2842941c6f9c6350b23351b33525fc5b19df4063/upgrade.properties
diff --git a/upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/go.dbscheme b/ql/lib/upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/go.dbscheme
similarity index 100%
rename from upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/go.dbscheme
rename to ql/lib/upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/go.dbscheme
diff --git a/upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/old.dbscheme b/ql/lib/upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/old.dbscheme
similarity index 100%
rename from upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/old.dbscheme
rename to ql/lib/upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/old.dbscheme
diff --git a/upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/upgrade.properties b/ql/lib/upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/upgrade.properties
similarity index 100%
rename from upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/upgrade.properties
rename to ql/lib/upgrades/4affa49dbe2bbab1a33f0e3ea6b045116abbcfda/upgrade.properties
diff --git a/upgrades/CHANGELOG.md b/ql/lib/upgrades/CHANGELOG.md
similarity index 100%
rename from upgrades/CHANGELOG.md
rename to ql/lib/upgrades/CHANGELOG.md
diff --git a/upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/go.dbscheme b/ql/lib/upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/go.dbscheme
similarity index 100%
rename from upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/go.dbscheme
rename to ql/lib/upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/go.dbscheme
diff --git a/upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/old.dbscheme b/ql/lib/upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/old.dbscheme
similarity index 100%
rename from upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/old.dbscheme
rename to ql/lib/upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/old.dbscheme
diff --git a/upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/upgrade.properties b/ql/lib/upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/upgrade.properties
similarity index 100%
rename from upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/upgrade.properties
rename to ql/lib/upgrades/b37faf5d62cccefad9fcfd8f5c026620097b2355/upgrade.properties
diff --git a/upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/go.dbscheme b/ql/lib/upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/go.dbscheme
similarity index 100%
rename from upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/go.dbscheme
rename to ql/lib/upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/go.dbscheme
diff --git a/upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/old.dbscheme b/ql/lib/upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/old.dbscheme
similarity index 100%
rename from upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/old.dbscheme
rename to ql/lib/upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/old.dbscheme
diff --git a/upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/upgrade.properties b/ql/lib/upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/upgrade.properties
similarity index 100%
rename from upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/upgrade.properties
rename to ql/lib/upgrades/b9a2082d22aebdd102e11995a7cfd46e0268a813/upgrade.properties
diff --git a/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/go.dbscheme b/ql/lib/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/go.dbscheme
similarity index 100%
rename from upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/go.dbscheme
rename to ql/lib/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/go.dbscheme
diff --git a/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/old.dbscheme b/ql/lib/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/old.dbscheme
similarity index 100%
rename from upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/old.dbscheme
rename to ql/lib/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/old.dbscheme
diff --git a/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/upgrade.properties b/ql/lib/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/upgrade.properties
similarity index 100%
rename from upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/upgrade.properties
rename to ql/lib/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/upgrade.properties
diff --git a/upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/go.dbscheme b/ql/lib/upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/go.dbscheme
similarity index 100%
rename from upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/go.dbscheme
rename to ql/lib/upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/go.dbscheme
diff --git a/upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/old.dbscheme b/ql/lib/upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/old.dbscheme
similarity index 100%
rename from upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/old.dbscheme
rename to ql/lib/upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/old.dbscheme
diff --git a/upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/upgrade.properties b/ql/lib/upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/upgrade.properties
similarity index 100%
rename from upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/upgrade.properties
rename to ql/lib/upgrades/bcbec1b0e44ae4365dd4e5bade5aec80135a4a00/upgrade.properties
diff --git a/upgrades/change-notes/released/0.0.3.md b/ql/lib/upgrades/change-notes/released/0.0.3.md
similarity index 100%
rename from upgrades/change-notes/released/0.0.3.md
rename to ql/lib/upgrades/change-notes/released/0.0.3.md
diff --git a/upgrades/codeql-pack.release.yml b/ql/lib/upgrades/codeql-pack.release.yml
similarity index 100%
rename from upgrades/codeql-pack.release.yml
rename to ql/lib/upgrades/codeql-pack.release.yml
diff --git a/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/go.dbscheme b/ql/lib/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/go.dbscheme
similarity index 100%
rename from upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/go.dbscheme
rename to ql/lib/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/go.dbscheme
diff --git a/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/old.dbscheme b/ql/lib/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/old.dbscheme
similarity index 100%
rename from upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/old.dbscheme
rename to ql/lib/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/old.dbscheme
diff --git a/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade.properties b/ql/lib/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade.properties
similarity index 100%
rename from upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade.properties
rename to ql/lib/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade.properties
diff --git a/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade_comment_groups.ql b/ql/lib/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade_comment_groups.ql
similarity index 100%
rename from upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade_comment_groups.ql
rename to ql/lib/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade_comment_groups.ql
diff --git a/upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/go.dbscheme b/ql/lib/upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/go.dbscheme
similarity index 100%
rename from upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/go.dbscheme
rename to ql/lib/upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/go.dbscheme
diff --git a/upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/old.dbscheme b/ql/lib/upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/old.dbscheme
similarity index 100%
rename from upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/old.dbscheme
rename to ql/lib/upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/old.dbscheme
diff --git a/upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/upgrade.properties b/ql/lib/upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/upgrade.properties
similarity index 100%
rename from upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/upgrade.properties
rename to ql/lib/upgrades/f1263a745347568af228ad3ddb2decb142c3a1a8/upgrade.properties
diff --git a/upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/go.dbscheme b/ql/lib/upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/go.dbscheme
similarity index 100%
rename from upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/go.dbscheme
rename to ql/lib/upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/go.dbscheme
diff --git a/upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/old.dbscheme b/ql/lib/upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/old.dbscheme
similarity index 100%
rename from upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/old.dbscheme
rename to ql/lib/upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/old.dbscheme
diff --git a/upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/upgrade.properties b/ql/lib/upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/upgrade.properties
similarity index 100%
rename from upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/upgrade.properties
rename to ql/lib/upgrades/f7fb4ff6229adffa2c2c4238ef72c82359d56be4/upgrade.properties
diff --git a/upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/go.dbscheme b/ql/lib/upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/go.dbscheme
similarity index 100%
rename from upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/go.dbscheme
rename to ql/lib/upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/go.dbscheme
diff --git a/upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/old.dbscheme b/ql/lib/upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/old.dbscheme
similarity index 100%
rename from upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/old.dbscheme
rename to ql/lib/upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/old.dbscheme
diff --git a/upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/upgrade.properties b/ql/lib/upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/upgrade.properties
similarity index 100%
rename from upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/upgrade.properties
rename to ql/lib/upgrades/ffced433fce33521f90c1b6c66b611902cdceac2/upgrade.properties
diff --git a/upgrades/initial/go.dbscheme b/ql/lib/upgrades/initial/go.dbscheme
similarity index 100%
rename from upgrades/initial/go.dbscheme
rename to ql/lib/upgrades/initial/go.dbscheme
diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh
index 6453847f60f..321e92957d5 100755
--- a/scripts/install-deps.sh
+++ b/scripts/install-deps.sh
@@ -16,7 +16,7 @@ else
     exit 1
 fi
 
-for d in ql/lib ql/src ql/test ql/examples upgrades
+for d in ql/lib ql/src ql/test ql/examples
 do
     codeql pack install --mode ${LOCK_MODE} "${GO_ROOT}/${d}"
-done
\ No newline at end of file
+done
diff --git a/upgrades/change-notes/released/0.0.4.md b/upgrades/change-notes/released/0.0.4.md
deleted file mode 100644
index 3268fefb272..00000000000
--- a/upgrades/change-notes/released/0.0.4.md
+++ /dev/null
@@ -1 +0,0 @@
-## 0.0.4
diff --git a/upgrades/qlpack.lock.yml b/upgrades/qlpack.lock.yml
deleted file mode 100644
index 06dd07fc7dc..00000000000
--- a/upgrades/qlpack.lock.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-dependencies: {}
-compiled: false
-lockVersion: 1.0.0
diff --git a/upgrades/qlpack.yml b/upgrades/qlpack.yml
deleted file mode 100644
index 0fbe8a7e195..00000000000
--- a/upgrades/qlpack.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: codeql/go-upgrades
-version: 0.0.5-dev
-groups: go
-upgrades: .
-library: true