diff --git a/codeql-workspace.yml b/codeql-workspace.yml
index 042c5787843..2d86498cbea 100644
--- a/codeql-workspace.yml
+++ b/codeql-workspace.yml
@@ -4,7 +4,8 @@ provide:
   - "*/ql/test/qlpack.yml"
   - "*/ql/examples/qlpack.yml"
   - "*/ql/consistency-queries/qlpack.yml"
-  - "*/ql/automodel/qlpack.yml"
+  - "*/ql/automodel/src/qlpack.yml"
+  - "*/ql/automodel/test/qlpack.yml"
   - "shared/*/qlpack.yml"
   - "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml"
   - "go/ql/config/legacy-support/qlpack.yml"
diff --git a/java/ql/automodel/publish.sh b/java/ql/automodel/publish.sh
new file mode 100755
index 00000000000..04b0d3f6ac1
--- /dev/null
+++ b/java/ql/automodel/publish.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+set -e
+
+AUTOMODEL_ROOT="$(dirname $0)"
+WORKSPACE_ROOT="$AUTOMODEL_ROOT/../../../.."
+GRPS="automodel,-test"
+
+if [ -z "$CODEQL_DIST" ]; then
+  echo "CODEQL_DIST not set"
+  exit -1
+fi
+
+cd "$AUTOMODEL_ROOT"
+echo Testing automodel queries
+"${CODEQL_DIST}/codeql" test run test
+
+cd "$WORKSPACE_ROOT"
+
+echo Preparing release
+"${CODEQL_DIST}/codeql" pack release --groups $GRPS
+
+echo Publishing automodel
+"${CODEQL_DIST}/codeql" pack publish --groups $GRPS
+
+echo Bumping versions
+"${CODEQL_DIST}/codeql" pack post-release --groups $GRPS
+
+echo Automodel packs successfully published. Please commit and push the version changes.
diff --git a/java/ql/automodel/qlpack.yml b/java/ql/automodel/src/qlpack.yml
similarity index 51%
rename from java/ql/automodel/qlpack.yml
rename to java/ql/automodel/src/qlpack.yml
index 12d756bc67d..9a6f54562ef 100644
--- a/java/ql/automodel/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,7 +1,8 @@
 name: codeql/java-automodel-queries
-version: 0.0.1
+version: 0.0.1-dev
+groups:
+    - java
+    - automodel
 dependencies:
   codeql/java-all: ${workspace}
-extractor: java
-tests: test
 warnOnImplicitThis: true
\ No newline at end of file
diff --git a/java/ql/automodel/test/qlpack.yml b/java/ql/automodel/test/qlpack.yml
new file mode 100644
index 00000000000..11f5ec8c192
--- /dev/null
+++ b/java/ql/automodel/test/qlpack.yml
@@ -0,0 +1,12 @@
+name: codeql/java-automodel-tests
+version: 0.0.1-dev
+groups:
+    - java
+    - automodel
+    - test
+dependencies:
+  codeql/java-all: ${workspace}
+  codeql/java-automodel-queries: ${workspace}
+extractor: java
+tests: .
+warnOnImplicitThis: true
\ No newline at end of file