diff --git a/.github/template_gitref b/.github/template_gitref
index d98f4b2453..64258d6111 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-342-g13e7dc5
+2021.08.26-343-g009fef6
diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh
index 5c5d6cbf4c..d84a46d01a 100755
--- a/.github/workflows/scripts/script.sh
+++ b/.github/workflows/scripts/script.sh
@@ -67,7 +67,9 @@ then
     echo $item
     COMPONENT="$(jq -r '.component' <<<"$item")"
     VERSION="$(jq -r '.version' <<<"$item")"
-    MODULE="$(jq -r '.module' <<<"$item")"
+    # On older status endpoints, the module was not provided, but the package should be accurate
+    # there, because we did not merge plugins into pulpcore back then.
+    MODULE="$(jq -r '.module // (.package|gsub("-"; "_"))' <<<"$item")"
     PACKAGE="${MODULE%%.*}"
     cmd_prefix pulpcore-manager openapi --bindings --component "${COMPONENT}" > api.json
     ./gen-client.sh api.json "${COMPONENT}" python "${PACKAGE}"
@@ -81,7 +83,9 @@ else
     echo $item
     COMPONENT="$(jq -r '.component' <<<"$item")"
     VERSION="$(jq -r '.version' <<<"$item")"
-    MODULE="$(jq -r '.module' <<<"$item")"
+    # On older status endpoints, the module was not provided, but the package should be accurate
+    # there, because we did not merge plugins into pulpcore back then.
+    MODULE="$(jq -r '.module // (.package|gsub("-"; "_"))' <<<"$item")"
     PACKAGE="${MODULE%%.*}"
     cmd_prefix pulpcore-manager openapi --bindings --component "${COMPONENT}" > api.json
     ./gen-client.sh api.json "${COMPONENT}" python "${PACKAGE}"
diff --git a/docs/template_gitref b/docs/template_gitref
index d98f4b2453..64258d6111 100644
--- a/docs/template_gitref
+++ b/docs/template_gitref
@@ -1 +1 @@
-2021.08.26-342-g13e7dc5
+2021.08.26-343-g009fef6