diff --git a/README.md b/README.md
index 189b69c..ec765e7 100644
--- a/README.md
+++ b/README.md
@@ -78,10 +78,15 @@ ansible-doc -t callback ansible.posix.profile_tasks
 
 The following ansible-core versions have been tested with this collection:
 
-- ansible-core 2.20 (devel)
-- ansible-core 2.19 (stable) *
-- ansible-core 2.18 (stable)
-- ansible-core 2.17 (stable)
+- ansible-core 2.22 (devel)
+- ansible-core 2.21 (stable)
+- ansible-core 2.20 (stable)
+- ansible-core 2.19 (stable)
+- ansible-core 2.18 (LTS)
+- ansible-core 2.17 (EoL)
+- ansible-core 2.16 (EoL)
+
+For most up to date support info, see the [ansible-core support matrix](https://docs.ansible.com/projects/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix)
 
 ## Contributing
 
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index 44beb23..256eccb 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -65,13 +65,16 @@ fi
 export ANSIBLE_COLLECTIONS_PATH="${PWD}/../../../"
 
 # START: HACK install dependencies
-if [ "${ansible_version}" == "2.9" ] || [ "${ansible_version}" == "2.10" ]; then
-    # Note: Since community.general 5.x, Ansible Core versions prior to 2.11 are not supported.
-    # So we need to use 4.8.1 for Ansible 2.9 and Ansible Engine 2.10.
-    retry git clone --depth=1 --single-branch -b 4.8.1 https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/community/general"
+if [ "${ansible_version}" == "2.16" ]; then
+# Note: Since community.general 12.x dropped support for ansible-core 2.16,
+# we need to use stable-11 for ansible-core 2.16.
+    target_branch='stable-11'
 else
-    retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/community/general"
+    target_branch='main'
 fi
+
+retry git clone --depth=1 --single-branch -b "${target_branch}" https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/community/general"
+
 # Note:  we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
 # END: HACK