diff --git a/.github/workflows/molecule_tests.yml b/.github/workflows/molecule_tests.yml
index e856e57b15..df4cde9c6b 100644
--- a/.github/workflows/molecule_tests.yml
+++ b/.github/workflows/molecule_tests.yml
@@ -38,7 +38,7 @@ jobs:
           - freetds
           # - friends_of_pul
           - geaccirc
-          - geoserver
+          # - geoserver
           - hr_share
           - imagemagick
           - kakadu
@@ -77,27 +77,25 @@ jobs:
           # - repec
           - researchdata
           # - resque_worker
-          - ruby
+          # - ruby
           - ruby_s
           - samba
-          - saxon
+          # - saxon
           - shared_data
-          - shibboleth
+          # - shibboleth
           - sidekiq_worker
           - simple_annotation
           - sneakers_worker
-          - solrcloud
+          # - solrcloud
           - special_collections
           - subversion
           - svn
           - timezone
           - tippecanoe
           - towerdeploy
-          - tomcat8
           - video_reserves
           - vips
-          - zookeeper
-          # - zookeeper_src
+          # - zookeeper
     steps:
       - name: Checkout branch
         run: |
diff --git a/Pipfile b/Pipfile
index d752ef1705..e5d0c4ba5f 100644
--- a/Pipfile
+++ b/Pipfile
@@ -4,13 +4,12 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-ansible = "==5.4.0"
-ansible-lint = "==5.4.0"
+ansible = "==9.1.0"
+ansible-lint = "==6.22.1"
 gitpython = "*"
 gitdb = "*"
-molecule = "==5.0.1"
+molecule = "==6.0.3"
 pyyaml = "==6.0"
-yamllint = "==1.26.3"
 requests = "==2.31.0"
 dnspython = "*"
 molecule-plugins = {extras = ["docker"], version = "*"}
diff --git a/Pipfile.lock b/Pipfile.lock
index a3e1b7c9b8..0dc6763d3a 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "4b0ce1c1bc546221cf202a9ab0a8cedaa0c5ac490ea8094313bf199b9d1544f2"
+            "sha256": "b0c2e441474afa8c96909173a87bd8b9aed2cdd232cda391a876bfa5442bab68"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -19,58 +19,73 @@
     "default": {
         "ansible": {
             "hashes": [
-                "sha256:2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc"
+                "sha256:5ad94991fb0e0e53a770a9ffcf1b68047f61b2282d948a7d2682ecd8fb8fa1bf",
+                "sha256:bd88f16ca4b4dadfec78723f982c0f04e5481c6be497ccb43ea3b40fded39126"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==5.4.0"
+            "markers": "python_version >= '3.10'",
+            "version": "==9.1.0"
         },
         "ansible-compat": {
             "hashes": [
-                "sha256:1c051fb7cedd7a067c5b8fca86e76109bff69cdd31115dea751e3166296a73da",
-                "sha256:a10ea191f9efe08590ff64cb46a31af1f8142c08618db1a4bc827ed257c68230"
+                "sha256:74a91807808a39af48ab6595811b9340d1458db26b138362f48bf39292190705",
+                "sha256:b3e9f9d7c3a1ce6222de444e9dc6fece7eba70ac64f2a0befdc4e2d542018b4a"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.0.2"
+            "markers": "python_version >= '3.9'",
+            "version": "==4.1.11"
         },
         "ansible-core": {
             "hashes": [
-                "sha256:feb1df61738cfc1f5e893b42a2ec1a7de32977d67e86707b45eb63d0c5c3c236"
+                "sha256:494f002edcb17b02baef661ff27b8c9c750a534bdc0537ab29dc02e680817d92",
+                "sha256:e4ab559e7e525b1c6f99084fca873bb014775d5ecbe845b7c07b8e9d6c9c048b"
             ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.12.10"
+            "markers": "python_version >= '3.10'",
+            "version": "==2.16.2"
         },
         "ansible-lint": {
             "hashes": [
-                "sha256:2160a60b4ab034c04006d701a1779340ffb0f6e28f030ff8de958e1062a88962",
-                "sha256:fb57755825b50da88c226052772bd843d37714155b504175912daac0e186e8c0"
+                "sha256:6568061beb56ffe0fc76cf35c44291318b3937dca2312a68840592b1b01e906f",
+                "sha256:d4a3116e0726b98ffbc253f35c5ede98bee546d72d9c363f65e6e79467784d15"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.6'",
-            "version": "==5.4.0"
-        },
-        "arrow": {
-            "hashes": [
-                "sha256:c728b120ebc00eb84e01882a6f5e7927a53960aa990ce7dd2b10f39005a67f80",
-                "sha256:d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4d67a85"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.3.0"
+            "markers": "python_version >= '3.9'",
+            "version": "==6.22.1"
         },
         "attrs": {
             "hashes": [
-                "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04",
-                "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"
+                "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30",
+                "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==23.1.0"
-        },
-        "binaryornot": {
-            "hashes": [
-                "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061",
-                "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"
+            "version": "==23.2.0"
+        },
+        "black": {
+            "hashes": [
+                "sha256:0808494f2b2df923ffc5723ed3c7b096bd76341f6213989759287611e9837d50",
+                "sha256:1fa88a0f74e50e4487477bc0bb900c6781dbddfdfa32691e780bf854c3b4a47f",
+                "sha256:25e57fd232a6d6ff3f4478a6fd0580838e47c93c83eaf1ccc92d4faf27112c4e",
+                "sha256:2d9e13db441c509a3763a7a3d9a49ccc1b4e974a47be4e08ade2a228876500ec",
+                "sha256:3e1b38b3135fd4c025c28c55ddfc236b05af657828a8a6abe5deec419a0b7055",
+                "sha256:3fa4be75ef2a6b96ea8d92b1587dd8cb3a35c7e3d51f0738ced0781c3aa3a5a3",
+                "sha256:4ce3ef14ebe8d9509188014d96af1c456a910d5b5cbf434a09fef7e024b3d0d5",
+                "sha256:4f0031eaa7b921db76decd73636ef3a12c942ed367d8c3841a0739412b260a54",
+                "sha256:602cfb1196dc692424c70b6507593a2b29aac0547c1be9a1d1365f0d964c353b",
+                "sha256:6d1bd9c210f8b109b1762ec9fd36592fdd528485aadb3f5849b2740ef17e674e",
+                "sha256:78baad24af0f033958cad29731e27363183e140962595def56423e626f4bee3e",
+                "sha256:8d4df77958a622f9b5a4c96edb4b8c0034f8434032ab11077ec6c56ae9f384ba",
+                "sha256:97e56155c6b737854e60a9ab1c598ff2533d57e7506d97af5481141671abf3ea",
+                "sha256:9c4352800f14be5b4864016882cdba10755bd50805c95f728011bcb47a4afd59",
+                "sha256:a4d6a9668e45ad99d2f8ec70d5c8c04ef4f32f648ef39048d010b0689832ec6d",
+                "sha256:a920b569dc6b3472513ba6ddea21f440d4b4c699494d2e972a1753cdc25df7b0",
+                "sha256:ae76c22bde5cbb6bfd211ec343ded2163bba7883c7bc77f6b756a1049436fbb9",
+                "sha256:b18fb2ae6c4bb63eebe5be6bd869ba2f14fd0259bda7d18a46b764d8fb86298a",
+                "sha256:c04b6d9d20e9c13f43eee8ea87d44156b8505ca8a3c878773f68b4e4812a421e",
+                "sha256:c88b3711d12905b74206227109272673edce0cb29f27e1385f33b0163c414bba",
+                "sha256:dd15245c8b68fe2b6bd0f32c1556509d11bb33aec9b5d0866dd8e2ed3dba09c2",
+                "sha256:e0aaf6041986767a5e0ce663c7a2f0e9eaf21e6ff87a5f95cbf3675bfd4c41d2"
             ],
-            "version": "==0.4.4"
+            "markers": "python_version >= '3.8'",
+            "version": "==23.12.1"
         },
         "bracex": {
             "hashes": [
@@ -82,11 +97,11 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082",
-                "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"
+                "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1",
+                "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==2023.7.22"
+            "version": "==2023.11.17"
         },
         "cffi": {
             "hashes": [
@@ -146,109 +161,101 @@
             "markers": "python_version >= '3.8'",
             "version": "==1.16.0"
         },
-        "chardet": {
-            "hashes": [
-                "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7",
-                "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==5.2.0"
-        },
         "charset-normalizer": {
             "hashes": [
-                "sha256:02673e456dc5ab13659f85196c534dc596d4ef260e4d86e856c3b2773ce09843",
-                "sha256:02af06682e3590ab952599fbadac535ede5d60d78848e555aa58d0c0abbde786",
-                "sha256:03680bb39035fbcffe828eae9c3f8afc0428c91d38e7d61aa992ef7a59fb120e",
-                "sha256:0570d21da019941634a531444364f2482e8db0b3425fcd5ac0c36565a64142c8",
-                "sha256:09c77f964f351a7369cc343911e0df63e762e42bac24cd7d18525961c81754f4",
-                "sha256:0d3d5b7db9ed8a2b11a774db2bbea7ba1884430a205dbd54a32d61d7c2a190fa",
-                "sha256:1063da2c85b95f2d1a430f1c33b55c9c17ffaf5e612e10aeaad641c55a9e2b9d",
-                "sha256:12ebea541c44fdc88ccb794a13fe861cc5e35d64ed689513a5c03d05b53b7c82",
-                "sha256:153e7b6e724761741e0974fc4dcd406d35ba70b92bfe3fedcb497226c93b9da7",
-                "sha256:15b26ddf78d57f1d143bdf32e820fd8935d36abe8a25eb9ec0b5a71c82eb3895",
-                "sha256:1872d01ac8c618a8da634e232f24793883d6e456a66593135aeafe3784b0848d",
-                "sha256:187d18082694a29005ba2944c882344b6748d5be69e3a89bf3cc9d878e548d5a",
-                "sha256:1b2919306936ac6efb3aed1fbf81039f7087ddadb3160882a57ee2ff74fd2382",
-                "sha256:232ac332403e37e4a03d209a3f92ed9071f7d3dbda70e2a5e9cff1c4ba9f0678",
-                "sha256:23e8565ab7ff33218530bc817922fae827420f143479b753104ab801145b1d5b",
-                "sha256:24817cb02cbef7cd499f7c9a2735286b4782bd47a5b3516a0e84c50eab44b98e",
-                "sha256:249c6470a2b60935bafd1d1d13cd613f8cd8388d53461c67397ee6a0f5dce741",
-                "sha256:24a91a981f185721542a0b7c92e9054b7ab4fea0508a795846bc5b0abf8118d4",
-                "sha256:2502dd2a736c879c0f0d3e2161e74d9907231e25d35794584b1ca5284e43f596",
-                "sha256:250c9eb0f4600361dd80d46112213dff2286231d92d3e52af1e5a6083d10cad9",
-                "sha256:278c296c6f96fa686d74eb449ea1697f3c03dc28b75f873b65b5201806346a69",
-                "sha256:2935ffc78db9645cb2086c2f8f4cfd23d9b73cc0dc80334bc30aac6f03f68f8c",
-                "sha256:2f4a0033ce9a76e391542c182f0d48d084855b5fcba5010f707c8e8c34663d77",
-                "sha256:30a85aed0b864ac88309b7d94be09f6046c834ef60762a8833b660139cfbad13",
-                "sha256:380c4bde80bce25c6e4f77b19386f5ec9db230df9f2f2ac1e5ad7af2caa70459",
-                "sha256:3ae38d325b512f63f8da31f826e6cb6c367336f95e418137286ba362925c877e",
-                "sha256:3b447982ad46348c02cb90d230b75ac34e9886273df3a93eec0539308a6296d7",
-                "sha256:3debd1150027933210c2fc321527c2299118aa929c2f5a0a80ab6953e3bd1908",
-                "sha256:4162918ef3098851fcd8a628bf9b6a98d10c380725df9e04caf5ca6dd48c847a",
-                "sha256:468d2a840567b13a590e67dd276c570f8de00ed767ecc611994c301d0f8c014f",
-                "sha256:4cc152c5dd831641e995764f9f0b6589519f6f5123258ccaca8c6d34572fefa8",
-                "sha256:542da1178c1c6af8873e143910e2269add130a299c9106eef2594e15dae5e482",
-                "sha256:557b21a44ceac6c6b9773bc65aa1b4cc3e248a5ad2f5b914b91579a32e22204d",
-                "sha256:5707a746c6083a3a74b46b3a631d78d129edab06195a92a8ece755aac25a3f3d",
-                "sha256:588245972aca710b5b68802c8cad9edaa98589b1b42ad2b53accd6910dad3545",
-                "sha256:5adf257bd58c1b8632046bbe43ee38c04e1038e9d37de9c57a94d6bd6ce5da34",
-                "sha256:619d1c96099be5823db34fe89e2582b336b5b074a7f47f819d6b3a57ff7bdb86",
-                "sha256:63563193aec44bce707e0c5ca64ff69fa72ed7cf34ce6e11d5127555756fd2f6",
-                "sha256:67b8cc9574bb518ec76dc8e705d4c39ae78bb96237cb533edac149352c1f39fe",
-                "sha256:6a685067d05e46641d5d1623d7c7fdf15a357546cbb2f71b0ebde91b175ffc3e",
-                "sha256:70f1d09c0d7748b73290b29219e854b3207aea922f839437870d8cc2168e31cc",
-                "sha256:750b446b2ffce1739e8578576092179160f6d26bd5e23eb1789c4d64d5af7dc7",
-                "sha256:7966951325782121e67c81299a031f4c115615e68046f79b85856b86ebffc4cd",
-                "sha256:7b8b8bf1189b3ba9b8de5c8db4d541b406611a71a955bbbd7385bbc45fcb786c",
-                "sha256:7f5d10bae5d78e4551b7be7a9b29643a95aded9d0f602aa2ba584f0388e7a557",
-                "sha256:805dfea4ca10411a5296bcc75638017215a93ffb584c9e344731eef0dcfb026a",
-                "sha256:81bf654678e575403736b85ba3a7867e31c2c30a69bc57fe88e3ace52fb17b89",
-                "sha256:82eb849f085624f6a607538ee7b83a6d8126df6d2f7d3b319cb837b289123078",
-                "sha256:85a32721ddde63c9df9ebb0d2045b9691d9750cb139c161c80e500d210f5e26e",
-                "sha256:86d1f65ac145e2c9ed71d8ffb1905e9bba3a91ae29ba55b4c46ae6fc31d7c0d4",
-                "sha256:86f63face3a527284f7bb8a9d4f78988e3c06823f7bea2bd6f0e0e9298ca0403",
-                "sha256:8eaf82f0eccd1505cf39a45a6bd0a8cf1c70dcfc30dba338207a969d91b965c0",
-                "sha256:93aa7eef6ee71c629b51ef873991d6911b906d7312c6e8e99790c0f33c576f89",
-                "sha256:96c2b49eb6a72c0e4991d62406e365d87067ca14c1a729a870d22354e6f68115",
-                "sha256:9cf3126b85822c4e53aa28c7ec9869b924d6fcfb76e77a45c44b83d91afd74f9",
-                "sha256:9fe359b2e3a7729010060fbca442ca225280c16e923b37db0e955ac2a2b72a05",
-                "sha256:a0ac5e7015a5920cfce654c06618ec40c33e12801711da6b4258af59a8eff00a",
-                "sha256:a3f93dab657839dfa61025056606600a11d0b696d79386f974e459a3fbc568ec",
-                "sha256:a4b71f4d1765639372a3b32d2638197f5cd5221b19531f9245fcc9ee62d38f56",
-                "sha256:aae32c93e0f64469f74ccc730a7cb21c7610af3a775157e50bbd38f816536b38",
-                "sha256:aaf7b34c5bc56b38c931a54f7952f1ff0ae77a2e82496583b247f7c969eb1479",
-                "sha256:abecce40dfebbfa6abf8e324e1860092eeca6f7375c8c4e655a8afb61af58f2c",
-                "sha256:abf0d9f45ea5fb95051c8bfe43cb40cda383772f7e5023a83cc481ca2604d74e",
-                "sha256:ac71b2977fb90c35d41c9453116e283fac47bb9096ad917b8819ca8b943abecd",
-                "sha256:ada214c6fa40f8d800e575de6b91a40d0548139e5dc457d2ebb61470abf50186",
-                "sha256:b09719a17a2301178fac4470d54b1680b18a5048b481cb8890e1ef820cb80455",
-                "sha256:b1121de0e9d6e6ca08289583d7491e7fcb18a439305b34a30b20d8215922d43c",
-                "sha256:b3b2316b25644b23b54a6f6401074cebcecd1244c0b8e80111c9a3f1c8e83d65",
-                "sha256:b3d9b48ee6e3967b7901c052b670c7dda6deb812c309439adaffdec55c6d7b78",
-                "sha256:b5bcf60a228acae568e9911f410f9d9e0d43197d030ae5799e20dca8df588287",
-                "sha256:b8f3307af845803fb0b060ab76cf6dd3a13adc15b6b451f54281d25911eb92df",
-                "sha256:c2af80fb58f0f24b3f3adcb9148e6203fa67dd3f61c4af146ecad033024dde43",
-                "sha256:c350354efb159b8767a6244c166f66e67506e06c8924ed74669b2c70bc8735b1",
-                "sha256:c5a74c359b2d47d26cdbbc7845e9662d6b08a1e915eb015d044729e92e7050b7",
-                "sha256:c71f16da1ed8949774ef79f4a0260d28b83b3a50c6576f8f4f0288d109777989",
-                "sha256:d47ecf253780c90ee181d4d871cd655a789da937454045b17b5798da9393901a",
-                "sha256:d7eff0f27edc5afa9e405f7165f85a6d782d308f3b6b9d96016c010597958e63",
-                "sha256:d97d85fa63f315a8bdaba2af9a6a686e0eceab77b3089af45133252618e70884",
-                "sha256:db756e48f9c5c607b5e33dd36b1d5872d0422e960145b08ab0ec7fd420e9d649",
-                "sha256:dc45229747b67ffc441b3de2f3ae5e62877a282ea828a5bdb67883c4ee4a8810",
-                "sha256:e0fc42822278451bc13a2e8626cf2218ba570f27856b536e00cfa53099724828",
-                "sha256:e39c7eb31e3f5b1f88caff88bcff1b7f8334975b46f6ac6e9fc725d829bc35d4",
-                "sha256:e46cd37076971c1040fc8c41273a8b3e2c624ce4f2be3f5dfcb7a430c1d3acc2",
-                "sha256:e5c1502d4ace69a179305abb3f0bb6141cbe4714bc9b31d427329a95acfc8bdd",
-                "sha256:edfe077ab09442d4ef3c52cb1f9dab89bff02f4524afc0acf2d46be17dc479f5",
-                "sha256:effe5406c9bd748a871dbcaf3ac69167c38d72db8c9baf3ff954c344f31c4cbe",
-                "sha256:f0d1e3732768fecb052d90d62b220af62ead5748ac51ef61e7b32c266cac9293",
-                "sha256:f5969baeaea61c97efa706b9b107dcba02784b1601c74ac84f2a532ea079403e",
-                "sha256:f8888e31e3a85943743f8fc15e71536bda1c81d5aa36d014a3c0c44481d7db6e",
-                "sha256:fc52b79d83a3fe3a360902d3f5d79073a993597d48114c29485e9431092905d8"
+                "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027",
+                "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087",
+                "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786",
+                "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8",
+                "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09",
+                "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185",
+                "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574",
+                "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e",
+                "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519",
+                "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898",
+                "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269",
+                "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3",
+                "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f",
+                "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6",
+                "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8",
+                "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a",
+                "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73",
+                "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc",
+                "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714",
+                "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2",
+                "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc",
+                "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce",
+                "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d",
+                "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e",
+                "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6",
+                "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269",
+                "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96",
+                "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d",
+                "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a",
+                "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4",
+                "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77",
+                "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d",
+                "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0",
+                "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed",
+                "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068",
+                "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac",
+                "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25",
+                "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8",
+                "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab",
+                "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26",
+                "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2",
+                "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db",
+                "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f",
+                "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5",
+                "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99",
+                "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c",
+                "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d",
+                "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811",
+                "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa",
+                "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a",
+                "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03",
+                "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b",
+                "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04",
+                "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c",
+                "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001",
+                "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458",
+                "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389",
+                "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99",
+                "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985",
+                "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537",
+                "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238",
+                "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f",
+                "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d",
+                "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796",
+                "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a",
+                "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143",
+                "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8",
+                "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c",
+                "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5",
+                "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5",
+                "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711",
+                "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4",
+                "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6",
+                "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c",
+                "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7",
+                "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4",
+                "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b",
+                "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae",
+                "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12",
+                "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c",
+                "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae",
+                "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8",
+                "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887",
+                "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b",
+                "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4",
+                "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f",
+                "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5",
+                "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33",
+                "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519",
+                "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"
             ],
             "markers": "python_full_version >= '3.7.0'",
-            "version": "==3.3.0"
+            "version": "==3.3.2"
         },
         "click": {
             "hashes": [
@@ -260,55 +267,39 @@
         },
         "click-help-colors": {
             "hashes": [
-                "sha256:756245e542d29226bb3bc056bfa58886f212ba2b82f4e8cf5fc884176ac96d72",
-                "sha256:82ef028cb0a332a154fa42fd7cca2c728a019b32bcb5a26bb32367551014a16f"
-            ],
-            "version": "==0.9.2"
-        },
-        "cookiecutter": {
-            "hashes": [
-                "sha256:6d1494e66a784f23324df9d593f3e43af3db4f4b926b9e49e6ff060169fc042a",
-                "sha256:8344663028abc08ec09b912e663636a97e1775bffe973425ec0107431acd390e"
+                "sha256:b33c5803eeaeb084393b1ab5899dc5476c7196b87a18713045afe76f840b42db",
+                "sha256:f4cabe52cf550299b8888f4f2ee4c5f359ac27e33bcfe4d61db47785a5cc936c"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.4.0"
+            "version": "==0.9.4"
         },
         "cryptography": {
             "hashes": [
-                "sha256:004b6ccc95943f6a9ad3142cfabcc769d7ee38a3f60fb0dddbfb431f818c3a67",
-                "sha256:047c4603aeb4bbd8db2756e38f5b8bd7e94318c047cfe4efeb5d715e08b49311",
-                "sha256:0d9409894f495d465fe6fda92cb70e8323e9648af912d5b9141d616df40a87b8",
-                "sha256:23a25c09dfd0d9f28da2352503b23e086f8e78096b9fd585d1d14eca01613e13",
-                "sha256:2ed09183922d66c4ec5fdaa59b4d14e105c084dd0febd27452de8f6f74704143",
-                "sha256:35c00f637cd0b9d5b6c6bd11b6c3359194a8eba9c46d4e875a3660e3b400005f",
-                "sha256:37480760ae08065437e6573d14be973112c9e6dcaf5f11d00147ee74f37a3829",
-                "sha256:3b224890962a2d7b57cf5eeb16ccaafba6083f7b811829f00476309bce2fe0fd",
-                "sha256:5a0f09cefded00e648a127048119f77bc2b2ec61e736660b5789e638f43cc397",
-                "sha256:5b72205a360f3b6176485a333256b9bcd48700fc755fef51c8e7e67c4b63e3ac",
-                "sha256:7e53db173370dea832190870e975a1e09c86a879b613948f09eb49324218c14d",
-                "sha256:7febc3094125fc126a7f6fb1f420d0da639f3f32cb15c8ff0dc3997c4549f51a",
-                "sha256:80907d3faa55dc5434a16579952ac6da800935cd98d14dbd62f6f042c7f5e839",
-                "sha256:86defa8d248c3fa029da68ce61fe735432b047e32179883bdb1e79ed9bb8195e",
-                "sha256:8ac4f9ead4bbd0bc8ab2d318f97d85147167a488be0e08814a37eb2f439d5cf6",
-                "sha256:93530900d14c37a46ce3d6c9e6fd35dbe5f5601bf6b3a5c325c7bffc030344d9",
-                "sha256:9eeb77214afae972a00dee47382d2591abe77bdae166bda672fb1e24702a3860",
-                "sha256:b5f4dfe950ff0479f1f00eda09c18798d4f49b98f4e2006d644b3301682ebdca",
-                "sha256:c3391bd8e6de35f6f1140e50aaeb3e2b3d6a9012536ca23ab0d9c35ec18c8a91",
-                "sha256:c880eba5175f4307129784eca96f4e70b88e57aa3f680aeba3bab0e980b0f37d",
-                "sha256:cecfefa17042941f94ab54f769c8ce0fe14beff2694e9ac684176a2535bf9714",
-                "sha256:e40211b4923ba5a6dc9769eab704bdb3fbb58d56c5b336d30996c24fcf12aadb",
-                "sha256:efc8ad4e6fc4f1752ebfb58aefece8b4e3c4cae940b0994d43649bdfce8d0d4f"
+                "sha256:079b85658ea2f59c4f43b70f8119a52414cdb7be34da5d019a77bf96d473b960",
+                "sha256:09616eeaef406f99046553b8a40fbf8b1e70795a91885ba4c96a70793de5504a",
+                "sha256:13f93ce9bea8016c253b34afc6bd6a75993e5c40672ed5405a9c832f0d4a00bc",
+                "sha256:37a138589b12069efb424220bf78eac59ca68b95696fc622b6ccc1c0a197204a",
+                "sha256:3c78451b78313fa81607fa1b3f1ae0a5ddd8014c38a02d9db0616133987b9cdf",
+                "sha256:43f2552a2378b44869fe8827aa19e69512e3245a219104438692385b0ee119d1",
+                "sha256:48a0476626da912a44cc078f9893f292f0b3e4c739caf289268168d8f4702a39",
+                "sha256:49f0805fc0b2ac8d4882dd52f4a3b935b210935d500b6b805f321addc8177406",
+                "sha256:5429ec739a29df2e29e15d082f1d9ad683701f0ec7709ca479b3ff2708dae65a",
+                "sha256:5a1b41bc97f1ad230a41657d9155113c7521953869ae57ac39ac7f1bb471469a",
+                "sha256:68a2dec79deebc5d26d617bfdf6e8aab065a4f34934b22d3b5010df3ba36612c",
+                "sha256:7a698cb1dac82c35fcf8fe3417a3aaba97de16a01ac914b89a0889d364d2f6be",
+                "sha256:841df4caa01008bad253bce2a6f7b47f86dc9f08df4b433c404def869f590a15",
+                "sha256:90452ba79b8788fa380dfb587cca692976ef4e757b194b093d845e8d99f612f2",
+                "sha256:928258ba5d6f8ae644e764d0f996d61a8777559f72dfeb2eea7e2fe0ad6e782d",
+                "sha256:af03b32695b24d85a75d40e1ba39ffe7db7ffcb099fe507b39fd41a565f1b157",
+                "sha256:b640981bf64a3e978a56167594a0e97db71c89a479da8e175d8bb5be5178c003",
+                "sha256:c5ca78485a255e03c32b513f8c2bc39fedb7f5c5f8535545bdc223a03b24f248",
+                "sha256:c7f3201ec47d5207841402594f1d7950879ef890c0c495052fa62f58283fde1a",
+                "sha256:d5ec85080cce7b0513cfd233914eb8b7bbd0633f1d1703aa28d1dd5a72f678ec",
+                "sha256:d6c391c021ab1f7a82da5d8d0b3cee2f4b2c455ec86c8aebbc84837a631ff309",
+                "sha256:e3114da6d7f95d2dee7d3f4eec16dacff819740bbab931aff8648cb13c5ff5e7",
+                "sha256:f983596065a18a2183e7f79ab3fd4c475205b839e02cbc0efbbf9666c4b3083d"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==41.0.4"
-        },
-        "distro": {
-            "hashes": [
-                "sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8",
-                "sha256:99522ca3e365cac527b44bde033f64c6945d90eb9f769703caaec52b09bbd3ff"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==1.8.0"
+            "version": "==41.0.7"
         },
         "dnspython": {
             "hashes": [
@@ -321,10 +312,10 @@
         },
         "docker": {
             "hashes": [
-                "sha256:aa6d17830045ba5ef0168d5eaa34d37beeb113948c413affe1d5991fc11f9a20",
-                "sha256:aecd2277b8bf8e506e484f6ab7aec39abe0038e29fa4a6d3ba86c3fe01844ed9"
+                "sha256:12ba681f2777a0ad28ffbcc846a69c31b4dfd9752b47eb425a274ee269c5e14b",
+                "sha256:323736fb92cd9418fc5e7133bc953e11a9da04f4483f828b527db553f1e7e5a3"
             ],
-            "version": "==6.1.3"
+            "version": "==7.0.0"
         },
         "enrich": {
             "hashes": [
@@ -334,39 +325,47 @@
             "markers": "python_version >= '3.6'",
             "version": "==1.2.7"
         },
+        "filelock": {
+            "hashes": [
+                "sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e",
+                "sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c"
+            ],
+            "markers": "python_version >= '3.8'",
+            "version": "==3.13.1"
+        },
         "gitdb": {
             "hashes": [
-                "sha256:6eb990b69df4e15bad899ea868dc46572c3f75339735663b81de79b06f17eb9a",
-                "sha256:c286cf298426064079ed96a9e4a9d39e7f3e9bf15ba60701e95f5492f28415c7"
+                "sha256:81a3407ddd2ee8df444cbacea00e2d038e40150acfa3001696fe0dcf1d3adfa4",
+                "sha256:bf5421126136d6d0af55bc1e7c1af1c397a34f5b7bd79e776cd3e89785c2b04b"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==4.0.10"
+            "version": "==4.0.11"
         },
         "gitpython": {
             "hashes": [
-                "sha256:5f4c4187de49616d710a77e98ddf17b4782060a1788df441846bddefbb89ab33",
-                "sha256:f9b9ddc0761c125d5780eab2d64be4873fc6817c2899cbcb34b02344bdc7bc54"
+                "sha256:c36b6634d069b3f719610175020a9aed919421c87552185b085e04fbbdb10b7c",
+                "sha256:ed66e624884f76df22c8e16066d567aaa5a37d5b5fa19db2c6df6f7156db9048"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==3.1.37"
+            "version": "==3.1.41"
         },
         "idna": {
             "hashes": [
-                "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4",
-                "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"
+                "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca",
+                "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==3.4"
+            "version": "==3.6"
         },
         "jinja2": {
             "hashes": [
-                "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852",
-                "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"
+                "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa",
+                "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==3.1.2"
+            "version": "==3.1.3"
         },
         "jmespath": {
             "hashes": [
@@ -379,19 +378,19 @@
         },
         "jsonschema": {
             "hashes": [
-                "sha256:cd5f1f9ed9444e554b38ba003af06c0a8c2868131e56bfbef0550fb450c0330e",
-                "sha256:ec84cc37cfa703ef7cd4928db24f9cb31428a5d0fa77747b8b51a847458e0bbf"
+                "sha256:3ba18e27f7491ea4a1b22edce00fb820eec968d397feb3f9cb61d5894bb38167",
+                "sha256:70a09719d375c0a2874571b363c8a24be7df8071b80c9aa76bc4551e7297c63c"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==4.19.1"
+            "version": "==4.21.0"
         },
         "jsonschema-specifications": {
             "hashes": [
-                "sha256:05adf340b659828a004220a9613be00fa3f223f2b82002e273dee62fd50524b1",
-                "sha256:c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb"
+                "sha256:48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc",
+                "sha256:87e4fdf3a94858b8a2ba2778d9ba57d8a9cafca7c7489c46ba0d30a8bc6a9c3c"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2023.7.1"
+            "version": "==2023.12.1"
         },
         "markdown-it-py": {
             "hashes": [
@@ -477,12 +476,12 @@
         },
         "molecule": {
             "hashes": [
-                "sha256:15a4c89e82ec1319bb1b36430061a103b91f1eb6d000b54330a161f4c8ee62d7",
-                "sha256:d02384a95188120ddfb4beb15ee0d9ea8b261825e37b36ef7d3fbdd63bd15806"
+                "sha256:8e5d7a7841f9ed5dd26878d24951ec030b86f780aca17ffc509db8076f42de3d",
+                "sha256:d2a881062fcc5ef1e08c1e5127c04354d2c95171955e270bd82b3fbfef72d3b0"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.9'",
-            "version": "==5.0.1"
+            "version": "==6.0.3"
         },
         "molecule-plugins": {
             "extras": [
@@ -495,6 +494,14 @@
             "markers": "python_version >= '3.9'",
             "version": "==23.5.0"
         },
+        "mypy-extensions": {
+            "hashes": [
+                "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d",
+                "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==1.0.0"
+        },
         "packaging": {
             "hashes": [
                 "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5",
@@ -505,11 +512,19 @@
         },
         "pathspec": {
             "hashes": [
-                "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20",
-                "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"
+                "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08",
+                "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==0.11.2"
+            "markers": "python_version >= '3.8'",
+            "version": "==0.12.1"
+        },
+        "platformdirs": {
+            "hashes": [
+                "sha256:11c8f37bcca40db96d8144522d925583bdb7a31f7b0e37e3ed4318400a8e2380",
+                "sha256:906d548203468492d432bcb294d4bc2fff751bf84971fbb2c10918cc206ee420"
+            ],
+            "markers": "python_version >= '3.8'",
+            "version": "==4.1.0"
         },
         "pluggy": {
             "hashes": [
@@ -528,27 +543,11 @@
         },
         "pygments": {
             "hashes": [
-                "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692",
-                "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.16.1"
-        },
-        "python-dateutil": {
-            "hashes": [
-                "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
-                "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==2.8.2"
-        },
-        "python-slugify": {
-            "hashes": [
-                "sha256:70ca6ea68fe63ecc8fa4fcf00ae651fc8a5d02d93dcd12ae6d4fc7ca46c4d395",
-                "sha256:ce0d46ddb668b3be82f4ed5e503dbc33dd815d83e2eb6824211310d3fb172a27"
+                "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c",
+                "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==8.0.1"
+            "version": "==2.17.2"
         },
         "pyyaml": {
             "hashes": [
@@ -599,11 +598,11 @@
         },
         "referencing": {
             "hashes": [
-                "sha256:449b6669b6121a9e96a7f9e410b245d471e8d48964c67113ce9afe50c8dd7bdf",
-                "sha256:794ad8003c65938edcdbc027f1933215e0d0ccc0291e3ce20a4d87432b59efc0"
+                "sha256:3c57da0513e9563eb7e203ebe9bb3a1b509b042016433bd1e45a2853466c3dd3",
+                "sha256:7e4dc12271d8e15612bfe35792f5ea1c40970dadf8624602e33db2758f7ee554"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.30.2"
+            "version": "==0.32.1"
         },
         "requests": {
             "hashes": [
@@ -616,156 +615,169 @@
         },
         "resolvelib": {
             "hashes": [
-                "sha256:8113ae3ed6d33c6be0bcbf03ffeb06c0995c099b7b8aaa5ddf2e9b3b3df4e915",
-                "sha256:9b9b80d5c60e4c2a8b7fbf0712c3449dc01d74e215632e5199850c9eca687628"
+                "sha256:04ce76cbd63fded2078ce224785da6ecd42b9564b1390793f64ddecbe997b309",
+                "sha256:d2da45d1a8dfee81bdd591647783e340ef3bcb104b54c383f70d422ef5cc7dbf"
             ],
-            "version": "==0.5.4"
+            "version": "==1.0.1"
         },
         "rich": {
             "hashes": [
-                "sha256:2b38e2fe9ca72c9a00170a1a2d20c63c790d0e10ef1fe35eba76e1e7b1d7d245",
-                "sha256:5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef"
+                "sha256:5cb5123b5cf9ee70584244246816e9114227e0b98ad9176eede6ad54bf5403fa",
+                "sha256:6da14c108c4866ee9520bbffa71f6fe3962e193b7da68720583850cd4548e235"
             ],
             "markers": "python_full_version >= '3.7.0'",
-            "version": "==13.6.0"
+            "version": "==13.7.0"
         },
         "rpds-py": {
             "hashes": [
-                "sha256:023574366002bf1bd751ebaf3e580aef4a468b3d3c216d2f3f7e16fdabd885ed",
-                "sha256:031f76fc87644a234883b51145e43985aa2d0c19b063e91d44379cd2786144f8",
-                "sha256:052a832078943d2b2627aea0d19381f607fe331cc0eb5df01991268253af8417",
-                "sha256:0699ab6b8c98df998c3eacf51a3b25864ca93dab157abe358af46dc95ecd9801",
-                "sha256:0713631d6e2d6c316c2f7b9320a34f44abb644fc487b77161d1724d883662e31",
-                "sha256:0774a46b38e70fdde0c6ded8d6d73115a7c39d7839a164cc833f170bbf539116",
-                "sha256:0898173249141ee99ffcd45e3829abe7bcee47d941af7434ccbf97717df020e5",
-                "sha256:09586f51a215d17efdb3a5f090d7cbf1633b7f3708f60a044757a5d48a83b393",
-                "sha256:102eac53bb0bf0f9a275b438e6cf6904904908562a1463a6fc3323cf47d7a532",
-                "sha256:10f32b53f424fc75ff7b713b2edb286fdbfc94bf16317890260a81c2c00385dc",
-                "sha256:150eec465dbc9cbca943c8e557a21afdcf9bab8aaabf386c44b794c2f94143d2",
-                "sha256:1d7360573f1e046cb3b0dceeb8864025aa78d98be4bb69f067ec1c40a9e2d9df",
-                "sha256:1f36a9d751f86455dc5278517e8b65580eeee37d61606183897f122c9e51cef3",
-                "sha256:24656dc36f866c33856baa3ab309da0b6a60f37d25d14be916bd3e79d9f3afcf",
-                "sha256:25860ed5c4e7f5e10c496ea78af46ae8d8468e0be745bd233bab9ca99bfd2647",
-                "sha256:26857f0f44f0e791f4a266595a7a09d21f6b589580ee0585f330aaccccb836e3",
-                "sha256:2bb2e4826be25e72013916eecd3d30f66fd076110de09f0e750163b416500721",
-                "sha256:2f6da6d842195fddc1cd34c3da8a40f6e99e4a113918faa5e60bf132f917c247",
-                "sha256:30adb75ecd7c2a52f5e76af50644b3e0b5ba036321c390b8e7ec1bb2a16dd43c",
-                "sha256:3339eca941568ed52d9ad0f1b8eb9fe0958fa245381747cecf2e9a78a5539c42",
-                "sha256:34ad87a831940521d462ac11f1774edf867c34172010f5390b2f06b85dcc6014",
-                "sha256:3777cc9dea0e6c464e4b24760664bd8831738cc582c1d8aacf1c3f546bef3f65",
-                "sha256:3953c6926a63f8ea5514644b7afb42659b505ece4183fdaaa8f61d978754349e",
-                "sha256:3c4eff26eddac49d52697a98ea01b0246e44ca82ab09354e94aae8823e8bda02",
-                "sha256:40578a6469e5d1df71b006936ce95804edb5df47b520c69cf5af264d462f2cbb",
-                "sha256:40f93086eef235623aa14dbddef1b9fb4b22b99454cb39a8d2e04c994fb9868c",
-                "sha256:4134aa2342f9b2ab6c33d5c172e40f9ef802c61bb9ca30d21782f6e035ed0043",
-                "sha256:442626328600bde1d09dc3bb00434f5374948838ce75c41a52152615689f9403",
-                "sha256:4a5ee600477b918ab345209eddafde9f91c0acd931f3776369585a1c55b04c57",
-                "sha256:4ce5a708d65a8dbf3748d2474b580d606b1b9f91b5c6ab2a316e0b0cf7a4ba50",
-                "sha256:516a611a2de12fbea70c78271e558f725c660ce38e0006f75139ba337d56b1f6",
-                "sha256:52c215eb46307c25f9fd2771cac8135d14b11a92ae48d17968eda5aa9aaf5071",
-                "sha256:53c43e10d398e365da2d4cc0bcaf0854b79b4c50ee9689652cdc72948e86f487",
-                "sha256:5752b761902cd15073a527b51de76bbae63d938dc7c5c4ad1e7d8df10e765138",
-                "sha256:5e8a78bd4879bff82daef48c14d5d4057f6856149094848c3ed0ecaf49f5aec2",
-                "sha256:5ed505ec6305abd2c2c9586a7b04fbd4baf42d4d684a9c12ec6110deefe2a063",
-                "sha256:5ee97c683eaface61d38ec9a489e353d36444cdebb128a27fe486a291647aff6",
-                "sha256:61fa268da6e2e1cd350739bb61011121fa550aa2545762e3dc02ea177ee4de35",
-                "sha256:64ccc28683666672d7c166ed465c09cee36e306c156e787acef3c0c62f90da5a",
-                "sha256:66414dafe4326bca200e165c2e789976cab2587ec71beb80f59f4796b786a238",
-                "sha256:68fe9199184c18d997d2e4293b34327c0009a78599ce703e15cd9a0f47349bba",
-                "sha256:6a555ae3d2e61118a9d3e549737bb4a56ff0cec88a22bd1dfcad5b4e04759175",
-                "sha256:6bdc11f9623870d75692cc33c59804b5a18d7b8a4b79ef0b00b773a27397d1f6",
-                "sha256:6cf4393c7b41abbf07c88eb83e8af5013606b1cdb7f6bc96b1b3536b53a574b8",
-                "sha256:6eef672de005736a6efd565577101277db6057f65640a813de6c2707dc69f396",
-                "sha256:734c41f9f57cc28658d98270d3436dba65bed0cfc730d115b290e970150c540d",
-                "sha256:73e0a78a9b843b8c2128028864901f55190401ba38aae685350cf69b98d9f7c9",
-                "sha256:775049dfa63fb58293990fc59473e659fcafd953bba1d00fc5f0631a8fd61977",
-                "sha256:7854a207ef77319ec457c1eb79c361b48807d252d94348305db4f4b62f40f7f3",
-                "sha256:78ca33811e1d95cac8c2e49cb86c0fb71f4d8409d8cbea0cb495b6dbddb30a55",
-                "sha256:79edd779cfc46b2e15b0830eecd8b4b93f1a96649bcb502453df471a54ce7977",
-                "sha256:7bf347b495b197992efc81a7408e9a83b931b2f056728529956a4d0858608b80",
-                "sha256:7fde6d0e00b2fd0dbbb40c0eeec463ef147819f23725eda58105ba9ca48744f4",
-                "sha256:81de24a1c51cfb32e1fbf018ab0bdbc79c04c035986526f76c33e3f9e0f3356c",
-                "sha256:879fb24304ead6b62dbe5034e7b644b71def53c70e19363f3c3be2705c17a3b4",
-                "sha256:8e7f2219cb72474571974d29a191714d822e58be1eb171f229732bc6fdedf0ac",
-                "sha256:9164ec8010327ab9af931d7ccd12ab8d8b5dc2f4c6a16cbdd9d087861eaaefa1",
-                "sha256:945eb4b6bb8144909b203a88a35e0a03d22b57aefb06c9b26c6e16d72e5eb0f0",
-                "sha256:99a57006b4ec39dbfb3ed67e5b27192792ffb0553206a107e4aadb39c5004cd5",
-                "sha256:9e9184fa6c52a74a5521e3e87badbf9692549c0fcced47443585876fcc47e469",
-                "sha256:9ff93d3aedef11f9c4540cf347f8bb135dd9323a2fc705633d83210d464c579d",
-                "sha256:a360cfd0881d36c6dc271992ce1eda65dba5e9368575663de993eeb4523d895f",
-                "sha256:a5d7ed104d158c0042a6a73799cf0eb576dfd5fc1ace9c47996e52320c37cb7c",
-                "sha256:ac17044876e64a8ea20ab132080ddc73b895b4abe9976e263b0e30ee5be7b9c2",
-                "sha256:ad857f42831e5b8d41a32437f88d86ead6c191455a3499c4b6d15e007936d4cf",
-                "sha256:b2039f8d545f20c4e52713eea51a275e62153ee96c8035a32b2abb772b6fc9e5",
-                "sha256:b455492cab07107bfe8711e20cd920cc96003e0da3c1f91297235b1603d2aca7",
-                "sha256:b4a9fe992887ac68256c930a2011255bae0bf5ec837475bc6f7edd7c8dfa254e",
-                "sha256:b5a53f5998b4bbff1cb2e967e66ab2addc67326a274567697379dd1e326bded7",
-                "sha256:b788276a3c114e9f51e257f2a6f544c32c02dab4aa7a5816b96444e3f9ffc336",
-                "sha256:bddd4f91eede9ca5275e70479ed3656e76c8cdaaa1b354e544cbcf94c6fc8ac4",
-                "sha256:c0503c5b681566e8b722fe8c4c47cce5c7a51f6935d5c7012c4aefe952a35eed",
-                "sha256:c1b3cd23d905589cb205710b3988fc8f46d4a198cf12862887b09d7aaa6bf9b9",
-                "sha256:c48f3fbc3e92c7dd6681a258d22f23adc2eb183c8cb1557d2fcc5a024e80b094",
-                "sha256:c63c3ef43f0b3fb00571cff6c3967cc261c0ebd14a0a134a12e83bdb8f49f21f",
-                "sha256:c6c45a2d2b68c51fe3d9352733fe048291e483376c94f7723458cfd7b473136b",
-                "sha256:caa1afc70a02645809c744eefb7d6ee8fef7e2fad170ffdeacca267fd2674f13",
-                "sha256:cc435d059f926fdc5b05822b1be4ff2a3a040f3ae0a7bbbe672babb468944722",
-                "sha256:cf693eb4a08eccc1a1b636e4392322582db2a47470d52e824b25eca7a3977b53",
-                "sha256:cf71343646756a072b85f228d35b1d7407da1669a3de3cf47f8bbafe0c8183a4",
-                "sha256:d08f63561c8a695afec4975fae445245386d645e3e446e6f260e81663bfd2e38",
-                "sha256:d29ddefeab1791e3c751e0189d5f4b3dbc0bbe033b06e9c333dca1f99e1d523e",
-                "sha256:d7f5e15c953ace2e8dde9824bdab4bec50adb91a5663df08d7d994240ae6fa31",
-                "sha256:d858532212f0650be12b6042ff4378dc2efbb7792a286bee4489eaa7ba010586",
-                "sha256:d97dd44683802000277bbf142fd9f6b271746b4846d0acaf0cefa6b2eaf2a7ad",
-                "sha256:dcdc88b6b01015da066da3fb76545e8bb9a6880a5ebf89e0f0b2e3ca557b3ab7",
-                "sha256:dd609fafdcdde6e67a139898196698af37438b035b25ad63704fd9097d9a3482",
-                "sha256:defa2c0c68734f4a82028c26bcc85e6b92cced99866af118cd6a89b734ad8e0d",
-                "sha256:e22260a4741a0e7a206e175232867b48a16e0401ef5bce3c67ca5b9705879066",
-                "sha256:e225a6a14ecf44499aadea165299092ab0cba918bb9ccd9304eab1138844490b",
-                "sha256:e3df0bc35e746cce42579826b89579d13fd27c3d5319a6afca9893a9b784ff1b",
-                "sha256:e6fcc026a3f27c1282c7ed24b7fcac82cdd70a0e84cc848c0841a3ab1e3dea2d",
-                "sha256:e782379c2028a3611285a795b89b99a52722946d19fc06f002f8b53e3ea26ea9",
-                "sha256:e8cdd52744f680346ff8c1ecdad5f4d11117e1724d4f4e1874f3a67598821069",
-                "sha256:e9616f5bd2595f7f4a04b67039d890348ab826e943a9bfdbe4938d0eba606971",
-                "sha256:e98c4c07ee4c4b3acf787e91b27688409d918212dfd34c872201273fdd5a0e18",
-                "sha256:ebdab79f42c5961682654b851f3f0fc68e6cc7cd8727c2ac4ffff955154123c1",
-                "sha256:f0f17f2ce0f3529177a5fff5525204fad7b43dd437d017dd0317f2746773443d",
-                "sha256:f4e56860a5af16a0fcfa070a0a20c42fbb2012eed1eb5ceeddcc7f8079214281"
+                "sha256:01f58a7306b64e0a4fe042047dd2b7d411ee82e54240284bab63e325762c1147",
+                "sha256:0210b2668f24c078307260bf88bdac9d6f1093635df5123789bfee4d8d7fc8e7",
+                "sha256:02866e060219514940342a1f84303a1ef7a1dad0ac311792fbbe19b521b489d2",
+                "sha256:0387ce69ba06e43df54e43968090f3626e231e4bc9150e4c3246947567695f68",
+                "sha256:060f412230d5f19fc8c8b75f315931b408d8ebf56aec33ef4168d1b9e54200b1",
+                "sha256:071bc28c589b86bc6351a339114fb7a029f5cddbaca34103aa573eba7b482382",
+                "sha256:0bfb09bf41fe7c51413f563373e5f537eaa653d7adc4830399d4e9bdc199959d",
+                "sha256:10162fe3f5f47c37ebf6d8ff5a2368508fe22007e3077bf25b9c7d803454d921",
+                "sha256:149c5cd24f729e3567b56e1795f74577aa3126c14c11e457bec1b1c90d212e38",
+                "sha256:1701fc54460ae2e5efc1dd6350eafd7a760f516df8dbe51d4a1c79d69472fbd4",
+                "sha256:1957a2ab607f9added64478a6982742eb29f109d89d065fa44e01691a20fc20a",
+                "sha256:1a746a6d49665058a5896000e8d9d2f1a6acba8a03b389c1e4c06e11e0b7f40d",
+                "sha256:1bfcad3109c1e5ba3cbe2f421614e70439f72897515a96c462ea657261b96518",
+                "sha256:1d36b2b59e8cc6e576f8f7b671e32f2ff43153f0ad6d0201250a7c07f25d570e",
+                "sha256:1db228102ab9d1ff4c64148c96320d0be7044fa28bd865a9ce628ce98da5973d",
+                "sha256:1dc29db3900cb1bb40353772417800f29c3d078dbc8024fd64655a04ee3c4bdf",
+                "sha256:1e626b365293a2142a62b9a614e1f8e331b28f3ca57b9f05ebbf4cf2a0f0bdc5",
+                "sha256:1f3c3461ebb4c4f1bbc70b15d20b565759f97a5aaf13af811fcefc892e9197ba",
+                "sha256:20de7b7179e2031a04042e85dc463a93a82bc177eeba5ddd13ff746325558aa6",
+                "sha256:24e4900a6643f87058a27320f81336d527ccfe503984528edde4bb660c8c8d59",
+                "sha256:2528ff96d09f12e638695f3a2e0c609c7b84c6df7c5ae9bfeb9252b6fa686253",
+                "sha256:25f071737dae674ca8937a73d0f43f5a52e92c2d178330b4c0bb6ab05586ffa6",
+                "sha256:270987bc22e7e5a962b1094953ae901395e8c1e1e83ad016c5cfcfff75a15a3f",
+                "sha256:292f7344a3301802e7c25c53792fae7d1593cb0e50964e7bcdcc5cf533d634e3",
+                "sha256:2953937f83820376b5979318840f3ee47477d94c17b940fe31d9458d79ae7eea",
+                "sha256:2a792b2e1d3038daa83fa474d559acfd6dc1e3650ee93b2662ddc17dbff20ad1",
+                "sha256:2a7b2f2f56a16a6d62e55354dd329d929560442bd92e87397b7a9586a32e3e76",
+                "sha256:2f4eb548daf4836e3b2c662033bfbfc551db58d30fd8fe660314f86bf8510b93",
+                "sha256:3664d126d3388a887db44c2e293f87d500c4184ec43d5d14d2d2babdb4c64cad",
+                "sha256:3677fcca7fb728c86a78660c7fb1b07b69b281964673f486ae72860e13f512ad",
+                "sha256:380e0df2e9d5d5d339803cfc6d183a5442ad7ab3c63c2a0982e8c824566c5ccc",
+                "sha256:3ac732390d529d8469b831949c78085b034bff67f584559340008d0f6041a049",
+                "sha256:4128980a14ed805e1b91a7ed551250282a8ddf8201a4e9f8f5b7e6225f54170d",
+                "sha256:4341bd7579611cf50e7b20bb8c2e23512a3dc79de987a1f411cb458ab670eb90",
+                "sha256:436474f17733c7dca0fbf096d36ae65277e8645039df12a0fa52445ca494729d",
+                "sha256:4dc889a9d8a34758d0fcc9ac86adb97bab3fb7f0c4d29794357eb147536483fd",
+                "sha256:4e21b76075c01d65d0f0f34302b5a7457d95721d5e0667aea65e5bb3ab415c25",
+                "sha256:516fb8c77805159e97a689e2f1c80655c7658f5af601c34ffdb916605598cda2",
+                "sha256:5576ee2f3a309d2bb403ec292d5958ce03953b0e57a11d224c1f134feaf8c40f",
+                "sha256:5a024fa96d541fd7edaa0e9d904601c6445e95a729a2900c5aec6555fe921ed6",
+                "sha256:5d0e8a6434a3fbf77d11448c9c25b2f25244226cfbec1a5159947cac5b8c5fa4",
+                "sha256:5e7d63ec01fe7c76c2dbb7e972fece45acbb8836e72682bde138e7e039906e2c",
+                "sha256:60e820ee1004327609b28db8307acc27f5f2e9a0b185b2064c5f23e815f248f8",
+                "sha256:637b802f3f069a64436d432117a7e58fab414b4e27a7e81049817ae94de45d8d",
+                "sha256:65dcf105c1943cba45d19207ef51b8bc46d232a381e94dd38719d52d3980015b",
+                "sha256:698ea95a60c8b16b58be9d854c9f993c639f5c214cf9ba782eca53a8789d6b19",
+                "sha256:70fcc6c2906cfa5c6a552ba7ae2ce64b6c32f437d8f3f8eea49925b278a61453",
+                "sha256:720215373a280f78a1814becb1312d4e4d1077b1202a56d2b0815e95ccb99ce9",
+                "sha256:7450dbd659fed6dd41d1a7d47ed767e893ba402af8ae664c157c255ec6067fde",
+                "sha256:7b7d9ca34542099b4e185b3c2a2b2eda2e318a7dbde0b0d83357a6d4421b5296",
+                "sha256:7fbd70cb8b54fe745301921b0816c08b6d917593429dfc437fd024b5ba713c58",
+                "sha256:81038ff87a4e04c22e1d81f947c6ac46f122e0c80460b9006e6517c4d842a6ec",
+                "sha256:810685321f4a304b2b55577c915bece4c4a06dfe38f6e62d9cc1d6ca8ee86b99",
+                "sha256:82ada4a8ed9e82e443fcef87e22a3eed3654dd3adf6e3b3a0deb70f03e86142a",
+                "sha256:841320e1841bb53fada91c9725e766bb25009cfd4144e92298db296fb6c894fb",
+                "sha256:8587fd64c2a91c33cdc39d0cebdaf30e79491cc029a37fcd458ba863f8815383",
+                "sha256:8ffe53e1d8ef2520ebcf0c9fec15bb721da59e8ef283b6ff3079613b1e30513d",
+                "sha256:9051e3d2af8f55b42061603e29e744724cb5f65b128a491446cc029b3e2ea896",
+                "sha256:91e5a8200e65aaac342a791272c564dffcf1281abd635d304d6c4e6b495f29dc",
+                "sha256:93432e747fb07fa567ad9cc7aaadd6e29710e515aabf939dfbed8046041346c6",
+                "sha256:938eab7323a736533f015e6069a7d53ef2dcc841e4e533b782c2bfb9fb12d84b",
+                "sha256:9584f8f52010295a4a417221861df9bea4c72d9632562b6e59b3c7b87a1522b7",
+                "sha256:9737bdaa0ad33d34c0efc718741abaafce62fadae72c8b251df9b0c823c63b22",
+                "sha256:99da0a4686ada4ed0f778120a0ea8d066de1a0a92ab0d13ae68492a437db78bf",
+                "sha256:99f567dae93e10be2daaa896e07513dd4bf9c2ecf0576e0533ac36ba3b1d5394",
+                "sha256:9bdf1303df671179eaf2cb41e8515a07fc78d9d00f111eadbe3e14262f59c3d0",
+                "sha256:9f0e4dc0f17dcea4ab9d13ac5c666b6b5337042b4d8f27e01b70fae41dd65c57",
+                "sha256:a000133a90eea274a6f28adc3084643263b1e7c1a5a66eb0a0a7a36aa757ed74",
+                "sha256:a3264e3e858de4fc601741498215835ff324ff2482fd4e4af61b46512dd7fc83",
+                "sha256:a71169d505af63bb4d20d23a8fbd4c6ce272e7bce6cc31f617152aa784436f29",
+                "sha256:a967dd6afda7715d911c25a6ba1517975acd8d1092b2f326718725461a3d33f9",
+                "sha256:aa5bfb13f1e89151ade0eb812f7b0d7a4d643406caaad65ce1cbabe0a66d695f",
+                "sha256:ae35e8e6801c5ab071b992cb2da958eee76340e6926ec693b5ff7d6381441745",
+                "sha256:b686f25377f9c006acbac63f61614416a6317133ab7fafe5de5f7dc8a06d42eb",
+                "sha256:b760a56e080a826c2e5af09002c1a037382ed21d03134eb6294812dda268c811",
+                "sha256:b86b21b348f7e5485fae740d845c65a880f5d1eda1e063bc59bef92d1f7d0c55",
+                "sha256:b9412abdf0ba70faa6e2ee6c0cc62a8defb772e78860cef419865917d86c7342",
+                "sha256:bd345a13ce06e94c753dab52f8e71e5252aec1e4f8022d24d56decd31e1b9b23",
+                "sha256:be22ae34d68544df293152b7e50895ba70d2a833ad9566932d750d3625918b82",
+                "sha256:bf046179d011e6114daf12a534d874958b039342b347348a78b7cdf0dd9d6041",
+                "sha256:c3d2010656999b63e628a3c694f23020322b4178c450dc478558a2b6ef3cb9bb",
+                "sha256:c64602e8be701c6cfe42064b71c84ce62ce66ddc6422c15463fd8127db3d8066",
+                "sha256:d65e6b4f1443048eb7e833c2accb4fa7ee67cc7d54f31b4f0555b474758bee55",
+                "sha256:d8bbd8e56f3ba25a7d0cf980fc42b34028848a53a0e36c9918550e0280b9d0b6",
+                "sha256:da1ead63368c04a9bded7904757dfcae01eba0e0f9bc41d3d7f57ebf1c04015a",
+                "sha256:dbbb95e6fc91ea3102505d111b327004d1c4ce98d56a4a02e82cd451f9f57140",
+                "sha256:dbc56680ecf585a384fbd93cd42bc82668b77cb525343170a2d86dafaed2a84b",
+                "sha256:df3b6f45ba4515632c5064e35ca7f31d51d13d1479673185ba8f9fefbbed58b9",
+                "sha256:dfe07308b311a8293a0d5ef4e61411c5c20f682db6b5e73de6c7c8824272c256",
+                "sha256:e796051f2070f47230c745d0a77a91088fbee2cc0502e9b796b9c6471983718c",
+                "sha256:efa767c220d94aa4ac3a6dd3aeb986e9f229eaf5bce92d8b1b3018d06bed3772",
+                "sha256:f0b8bf5b8db49d8fd40f54772a1dcf262e8be0ad2ab0206b5a2ec109c176c0a4",
+                "sha256:f175e95a197f6a4059b50757a3dca33b32b61691bdbd22c29e8a8d21d3914cae",
+                "sha256:f2f3b28b40fddcb6c1f1f6c88c6f3769cd933fa493ceb79da45968a21dccc920",
+                "sha256:f6c43b6f97209e370124baf2bf40bb1e8edc25311a158867eb1c3a5d449ebc7a",
+                "sha256:f7f4cb1f173385e8a39c29510dd11a78bf44e360fb75610594973f5ea141028b",
+                "sha256:fad059a4bd14c45776600d223ec194e77db6c20255578bb5bcdd7c18fd169361",
+                "sha256:ff1dcb8e8bc2261a088821b2595ef031c91d499a0c1b031c152d43fe0a6ecec8",
+                "sha256:ffee088ea9b593cc6160518ba9bd319b5475e5f3e578e4552d63818773c6f56a"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.10.6"
+            "version": "==0.17.1"
         },
         "ruamel.yaml": {
             "hashes": [
-                "sha256:801046a9caacb1b43acc118969b49b96b65e8847f29029563b29ac61d02db61b",
-                "sha256:b105e3e6fc15b41fdb201ba1b95162ae566a4ef792b9f884c46b4ccc5513a87a"
+                "sha256:61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e",
+                "sha256:a013ac02f99a69cdd6277d9664689eb1acba07069f912823177c5eced21a6ada"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==0.17.35"
+            "version": "==0.18.5"
         },
         "ruamel.yaml.clib": {
             "hashes": [
+                "sha256:024cfe1fc7c7f4e1aff4a81e718109e13409767e4f871443cbff3dba3578203d",
                 "sha256:03d1162b6d1df1caa3a4bd27aa51ce17c9afc2046c31b0ad60a0a96ec22f8001",
                 "sha256:07238db9cbdf8fc1e9de2489a4f68474e70dffcb32232db7c08fa61ca0c7c462",
+                "sha256:09b055c05697b38ecacb7ac50bdab2240bfca1a0c4872b0fd309bb07dc9aa3a9",
+                "sha256:1707814f0d9791df063f8c19bb51b0d1278b8e9a2353abbb676c2f685dee6afe",
+                "sha256:1758ce7d8e1a29d23de54a16ae867abd370f01b5a69e1a3ba75223eaa3ca1a1b",
+                "sha256:184565012b60405d93838167f425713180b949e9d8dd0bbc7b49f074407c5a8b",
                 "sha256:1b617618914cb00bf5c34d4357c37aa15183fa229b24767259657746c9077615",
+                "sha256:1dc67314e7e1086c9fdf2680b7b6c2be1c0d8e3a8279f2e993ca2a7545fecf62",
                 "sha256:25ac8c08322002b06fa1d49d1646181f0b2c72f5cbc15a85e80b4c30a544bb15",
                 "sha256:25c515e350e5b739842fc3228d662413ef28f295791af5e5110b543cf0b57d9b",
+                "sha256:305889baa4043a09e5b76f8e2a51d4ffba44259f6b4c72dec8ca56207d9c6fe1",
+                "sha256:3213ece08ea033eb159ac52ae052a4899b56ecc124bb80020d9bbceeb50258e9",
                 "sha256:3f215c5daf6a9d7bbed4a0a4f760f3113b10e82ff4c5c44bec20a68c8014f675",
-                "sha256:3fcc54cb0c8b811ff66082de1680b4b14cf8a81dce0d4fbf665c2265a81e07a1",
+                "sha256:46d378daaac94f454b3a0e3d8d78cafd78a026b1d71443f4966c696b48a6d899",
+                "sha256:4ecbf9c3e19f9562c7fdd462e8d18dd902a47ca046a2e64dba80699f0b6c09b7",
                 "sha256:53a300ed9cea38cf5a2a9b069058137c2ca1ce658a874b79baceb8f892f915a7",
                 "sha256:56f4252222c067b4ce51ae12cbac231bce32aee1d33fbfc9d17e5b8d6966c312",
-                "sha256:665f58bfd29b167039f714c6998178d27ccd83984084c286110ef26b230f259f",
+                "sha256:5c365d91c88390c8d0a8545df0b5857172824b1c604e867161e6b3d59a827eaa",
                 "sha256:700e4ebb569e59e16a976857c8798aee258dceac7c7d6b50cab63e080058df91",
-                "sha256:7048c338b6c86627afb27faecf418768acb6331fc24cfa56c93e8c9780f815fa",
                 "sha256:75e1ed13e1f9de23c5607fe6bd1aeaae21e523b32d83bb33918245361e9cc51b",
+                "sha256:77159f5d5b5c14f7c34073862a6b7d34944075d9f93e681638f6d753606c6ce6",
                 "sha256:7f67a1ee819dc4562d444bbafb135832b0b909f81cc90f7aa00260968c9ca1b3",
+                "sha256:840f0c7f194986a63d2c2465ca63af8ccbbc90ab1c6001b1978f05119b5e7334",
                 "sha256:84b554931e932c46f94ab306913ad7e11bba988104c5cff26d90d03f68258cd5",
+                "sha256:87ea5ff66d8064301a154b3933ae406b0863402a799b16e4a1d24d9fbbcbe0d3",
                 "sha256:955eae71ac26c1ab35924203fda6220f84dce57d6d7884f189743e2abe3a9fbe",
-                "sha256:9eb5dee2772b0f704ca2e45b1713e4e5198c18f515b52743576d196348f374d3",
+                "sha256:a1a45e0bb052edf6a1d3a93baef85319733a888363938e1fc9924cb00c8df24c",
                 "sha256:a5aa27bad2bb83670b71683aae140a1f52b0857a2deff56ad3f6c13a017a26ed",
                 "sha256:a6a9ffd280b71ad062eae53ac1659ad86a17f59a0fdc7699fd9be40525153337",
+                "sha256:a75879bacf2c987c003368cf14bed0ffe99e8e85acfa6c0bfffc21a090f16880",
+                "sha256:aa2267c6a303eb483de8d02db2871afb5c5fc15618d894300b88958f729ad74f",
+                "sha256:aab7fd643f71d7946f2ee58cc88c9b7bfc97debd71dcc93e03e2d174628e7e2d",
                 "sha256:b16420e621d26fdfa949a8b4b47ade8810c56002f5389970db4ddda51dbff248",
                 "sha256:b42169467c42b692c19cf539c38d4602069d8c1505e97b86387fcf7afb766e1d",
-                "sha256:b5edda50e5e9e15e54a6a8a0070302b00c518a9d32accc2346ad6c984aacd279",
                 "sha256:bba64af9fa9cebe325a62fa398760f5c7206b215201b0ec825005f1b18b9bccf",
                 "sha256:beb2e0404003de9a4cab9753a8805a8fe9320ee6673136ed7f04255fe60bb512",
                 "sha256:bef08cd86169d9eafb3ccb0a39edb11d8e25f3dae2b28f5c52fd997521133069",
@@ -774,8 +786,9 @@
                 "sha256:c69212f63169ec1cfc9bb44723bf2917cbbd8f6191a00ef3410f5a7fe300722d",
                 "sha256:cabddb8d8ead485e255fe80429f833172b4cadf99274db39abc080e068cbcc31",
                 "sha256:d176b57452ab5b7028ac47e7b3cf644bcfdc8cacfecf7e71759f7f51a59e5c92",
-                "sha256:d92f81886165cb14d7b067ef37e142256f1c6a90a65cd156b063a43da1708cfd",
                 "sha256:da09ad1c359a728e112d60116f626cc9f29730ff3e0e7db72b9a2dbc2e4beed5",
+                "sha256:e2b4c44b60eadec492926a7270abb100ef9f72798e18743939bdbf037aab8c28",
+                "sha256:e79e5db08739731b0ce4850bed599235d601701d5694c36570a99a0c5ca41a9d",
                 "sha256:ebc06178e8821efc9692ea7544aa5644217358490145629914d8020042c24aa1",
                 "sha256:edaef1c1200c4b4cb914583150dcaa3bc30e592e907c01117c08b13a07255ec2",
                 "sha256:f481f16baec5290e45aebdc2a5168ebc6d35189ae6fea7a58787613a25f6e875",
@@ -784,29 +797,6 @@
             "markers": "python_version < '3.13' and platform_python_implementation == 'CPython'",
             "version": "==0.2.8"
         },
-        "selinux": {
-            "hashes": [
-                "sha256:2a88b337ac46ad0f06f557b2806c3df62421972f766673dd8bf26732fb75a9ea",
-                "sha256:ecf7add45c939e9dda682c390a2cd0a845c94a4793a2cce9e8870d4ee9501f99"
-            ],
-            "version": "==0.3.0"
-        },
-        "setuptools": {
-            "hashes": [
-                "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87",
-                "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==68.2.2"
-        },
-        "six": {
-            "hashes": [
-                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
-                "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.16.0"
-        },
         "smmap": {
             "hashes": [
                 "sha256:dceeb6c0028fdb6734471eb07c0cd2aae706ccaecab45965ee83f11c8d3b1f62",
@@ -823,35 +813,13 @@
             "markers": "python_version >= '3.8'",
             "version": "==0.4.1"
         },
-        "tenacity": {
-            "hashes": [
-                "sha256:5398ef0d78e63f40007c1fb4c0bff96e1911394d2fa8d194f77619c05ff6cc8a",
-                "sha256:ce510e327a630c9e1beaf17d42e6ffacc88185044ad85cf74c0a8887c6a0f88c"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==8.2.3"
-        },
-        "text-unidecode": {
-            "hashes": [
-                "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8",
-                "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"
-            ],
-            "version": "==1.3"
-        },
-        "types-python-dateutil": {
-            "hashes": [
-                "sha256:1f4f10ac98bb8b16ade9dbee3518d9ace017821d94b057a425b069f834737f4b",
-                "sha256:f977b8de27787639986b4e28963263fd0e5158942b3ecef91b9335c130cb1ce9"
-            ],
-            "version": "==2.8.19.14"
-        },
         "urllib3": {
             "hashes": [
-                "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84",
-                "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"
+                "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3",
+                "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.0.7"
+            "markers": "python_version >= '3.8'",
+            "version": "==2.1.0"
         },
         "wcmatch": {
             "hashes": [
@@ -861,21 +829,13 @@
             "markers": "python_version >= '3.8'",
             "version": "==8.5"
         },
-        "websocket-client": {
-            "hashes": [
-                "sha256:084072e0a7f5f347ef2ac3d8698a5e0b4ffbfcab607628cadabc650fc9a83a24",
-                "sha256:b3324019b3c28572086c4a319f91d1dcd44e6e11cd340232978c684a7650d0df"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.6.4"
-        },
         "yamllint": {
             "hashes": [
-                "sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e"
+                "sha256:28a19f5d68d28d8fec538a1db21bb2d84c7dc2e2ea36266da8d4d1c5a683814d",
+                "sha256:2dceab9ef2d99518a2fcf4ffc964d44250ac4459be1ba3ca315118e4a1a81f7d"
             ],
-            "index": "pypi",
-            "markers": "python_version >= '3.5'",
-            "version": "==1.26.3"
+            "markers": "python_version >= '3.8'",
+            "version": "==1.33.0"
         }
     },
     "develop": {}
diff --git a/playbooks/os_updates.yml b/playbooks/os_updates.yml
index 1edb0524ce..2818b0ffbd 100644
--- a/playbooks/os_updates.yml
+++ b/playbooks/os_updates.yml
@@ -47,10 +47,10 @@
         autoclean: true
       when: ansible_os_family == "Debian"
 
-    ## - name: Ubuntu | clear out the local repository of retrieved package files 
-    ## apt:
-    ## clean: true
-    ## when: ansible_os_family == "Debian"
+    - name: Ubuntu | clear out the local repository of retrieved package files 
+      ansible.builtin.apt:
+       clean: true
+      when: ansible_os_family == "Debian"
 
     - name: Ubuntu | Check if reboot required
       ansible.builtin.stat:
diff --git a/requirements.txt b/requirements.txt
index f5042e2441..3a8f05df30 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,48 +1,50 @@
-ansible-compat==4.1.2 ; python_version >= "3.11" and python_version < "4.0"
-ansible-core==2.12.10 ; python_version >= "3.11" and python_version < "4.0"
-ansible==5.10.0 ; python_version >= "3.11" and python_version < "4.0"
-arrow==1.2.3 ; python_version >= "3.11" and python_version < "4.0"
-attrs==23.1.0 ; python_version >= "3.11" and python_version < "4.0"
-binaryornot==0.4.4 ; python_version >= "3.11" and python_version < "4.0"
-certifi==2023.5.7 ; python_version >= "3.11" and python_version < "4.0"
-cffi==1.15.1 ; python_version >= "3.11" and python_version < "4.0"
-chardet==5.1.0 ; python_version >= "3.11" and python_version < "4.0"
-charset-normalizer==3.1.0 ; python_version >= "3.11" and python_version < "4.0"
-click-help-colors==0.9.1 ; python_version >= "3.11" and python_version < "4.0"
-click==8.1.3 ; python_version >= "3.11" and python_version < "4.0"
-colorama==0.4.6 ; python_version >= "3.11" and python_version < "4.0" and platform_system == "Windows"
-cookiecutter==2.1.1 ; python_version >= "3.11" and python_version < "4.0"
-cryptography==41.0.1 ; python_version >= "3.11" and python_version < "4.0"
-distro==1.8.0 ; (sys_platform == "linux" or sys_platform == "linux2") and python_version >= "3.11" and python_version < "4.0"
-docker==6.1.3 ; python_version >= "3.11" and python_version < "4.0"
-enrich==1.2.7 ; python_version >= "3.11" and python_version < "4.0"
-gitdb==4.0.10 ; python_version >= "3.11" and python_version < "4.0"
-gitpython==3.1.31 ; python_version >= "3.11" and python_version < "4.0"
-idna==3.4 ; python_version >= "3.11" and python_version < "4.0"
-jinja2-time==0.2.0 ; python_version >= "3.11" and python_version < "4.0"
-jinja2==3.1.2 ; python_version >= "3.11" and python_version < "4.0"
-jsonschema==4.17.3 ; python_version >= "3.11" and python_version < "4.0"
-markdown-it-py==3.0.0 ; python_version >= "3.11" and python_version < "4.0"
-markupsafe==2.1.3 ; python_version >= "3.11" and python_version < "4.0"
-mdurl==0.1.2 ; python_version >= "3.11" and python_version < "4.0"
-molecule-plugins[docker]==23.4.1 ; python_version >= "3.11" and python_version < "4.0"
-molecule==5.1.0 ; python_version >= "3.11" and python_version < "4.0"
-packaging==23.1 ; python_version >= "3.11" and python_version < "4.0"
-pluggy==1.2.0 ; python_version >= "3.11" and python_version < "4.0"
-pycparser==2.21 ; python_version >= "3.11" and python_version < "4.0"
-pygments==2.15.1 ; python_version >= "3.11" and python_version < "4.0"
-pyrsistent==0.19.3 ; python_version >= "3.11" and python_version < "4.0"
-python-dateutil==2.8.2 ; python_version >= "3.11" and python_version < "4.0"
-python-slugify==8.0.1 ; python_version >= "3.11" and python_version < "4.0"
-pywin32==306 ; python_version >= "3.11" and python_version < "4.0" and sys_platform == "win32"
-pyyaml==6.0 ; python_version >= "3.11" and python_version < "4.0"
-requests==2.31.0 ; python_version >= "3.11" and python_version < "4.0"
-resolvelib==0.5.4 ; python_version >= "3.11" and python_version < "4.0"
-rich==13.4.2 ; python_version >= "3.11" and python_version < "4.0"
-selinux==0.3.0 ; (sys_platform == "linux" or sys_platform == "linux2") and python_version >= "3.11" and python_version < "4.0"
-six==1.16.0 ; python_version >= "3.11" and python_version < "4.0"
-smmap==5.0.0 ; python_version >= "3.11" and python_version < "4.0"
-subprocess-tee==0.4.1 ; python_version >= "3.11" and python_version < "4.0"
-text-unidecode==1.3 ; python_version >= "3.11" and python_version < "4.0"
-urllib3==2.0.3 ; python_version >= "3.11" and python_version < "4.0"
-websocket-client==1.6.1 ; python_version >= "3.11" and python_version < "4.0"
+-i https://pypi.org/simple
+ansible==9.1.0; python_version >= '3.10'
+ansible-compat==4.1.11; python_version >= '3.9'
+ansible-core==2.16.2; python_version >= '3.10'
+ansible-lint==6.22.1; python_version >= '3.9'
+attrs==23.2.0; python_version >= '3.7'
+black==23.12.1; python_version >= '3.8'
+bracex==2.4; python_version >= '3.8'
+certifi==2023.11.17; python_version >= '3.6'
+cffi==1.16.0; python_version >= '3.8'
+charset-normalizer==3.3.2; python_full_version >= '3.7.0'
+click==8.1.7; python_version >= '3.7'
+click-help-colors==0.9.4
+cryptography==41.0.7; python_version >= '3.7'
+dnspython==2.4.2; python_version >= '3.8' and python_version < '4.0'
+docker==7.0.0
+enrich==1.2.7; python_version >= '3.6'
+filelock==3.13.1; python_version >= '3.8'
+gitdb==4.0.11; python_version >= '3.7'
+gitpython==3.1.41; python_version >= '3.7'
+idna==3.6; python_version >= '3.5'
+jinja2==3.1.3; python_version >= '3.7'
+jmespath==1.0.1; python_version >= '3.7'
+jsonschema==4.21.0; python_version >= '3.8'
+jsonschema-specifications==2023.12.1; python_version >= '3.8'
+markdown-it-py==3.0.0; python_version >= '3.8'
+markupsafe==2.1.3; python_version >= '3.7'
+mdurl==0.1.2; python_version >= '3.7'
+molecule==6.0.3; python_version >= '3.9'
+molecule-plugins[docker]==23.5.0; python_version >= '3.9'
+mypy-extensions==1.0.0; python_version >= '3.5'
+packaging==23.2; python_version >= '3.7'
+pathspec==0.12.1; python_version >= '3.8'
+platformdirs==4.1.0; python_version >= '3.8'
+pluggy==1.3.0; python_version >= '3.8'
+pycparser==2.21
+pygments==2.17.2; python_version >= '3.7'
+pyyaml==6.0; python_version >= '3.6'
+referencing==0.32.1; python_version >= '3.8'
+requests==2.31.0; python_version >= '3.7'
+resolvelib==1.0.1
+rich==13.7.0; python_full_version >= '3.7.0'
+rpds-py==0.17.1; python_version >= '3.8'
+ruamel.yaml==0.18.5; python_version >= '3.7'
+ruamel.yaml.clib==0.2.8; python_version < '3.13' and platform_python_implementation == 'CPython'
+smmap==5.0.1; python_version >= '3.7'
+subprocess-tee==0.4.1; python_version >= '3.8'
+urllib3==2.1.0; python_version >= '3.8'
+wcmatch==8.5; python_version >= '3.8'
+yamllint==1.33.0; python_version >= '3.8'
diff --git a/roles/abid/molecule/default/molecule.yml b/roles/abid/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/abid/molecule/default/molecule.yml
+++ b/roles/abid/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/apache2/molecule/default/molecule.yml b/roles/apache2/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/apache2/molecule/default/molecule.yml
+++ b/roles/apache2/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/bibdata_sqs_poller/molecule/default/molecule.yml b/roles/bibdata_sqs_poller/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/bibdata_sqs_poller/molecule/default/molecule.yml
+++ b/roles/bibdata_sqs_poller/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/bind9/molecule/default/molecule.yml b/roles/bind9/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/bind9/molecule/default/molecule.yml
+++ b/roles/bind9/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/bind9/molecule/default/verify.yml b/roles/bind9/molecule/default/verify.yml
index 5b53af49f6..6b5c939670 100644
--- a/roles/bind9/molecule/default/verify.yml
+++ b/roles/bind9/molecule/default/verify.yml
@@ -17,10 +17,3 @@
       that:
         - not pkg_status.changed
 
-  - name: get service facts
-    service_facts:
-
-  - name: check if bind9 is installed
-    fail:
-      msg: bind9 is not installed
-    when: ansible_facts.services["bind9"] is not defined
diff --git a/roles/byzantine/molecule/default/verify.yml b/roles/byzantine/molecule/default/verify.yml
index c23c0f2c5e..d6c9a3ba49 100644
--- a/roles/byzantine/molecule/default/verify.yml
+++ b/roles/byzantine/molecule/default/verify.yml
@@ -20,27 +20,6 @@
     register: present
     failed_when:
       - present is changed
-  - name: test for presence byzantine apache config
-    lineinfile:
-      path: "/etc/apache2/sites-available/000-default.conf"
-      line: "{{ item }}"
-      state: present
-    loop:
-      - "Alias /byzantine /var/www/byzantine/current"
-    check_mode: true
-    register: present
-    failed_when:
-  - name: test for presence byzantine php ini
-    lineinfile:
-      path: "/etc/apache2/sites-available/000-default.conf"
-      line: "{{ item }}"
-      state: present
-    loop:
-      - "upload_max_filesize = 8M"
-      - "memory_limit = 256M"
-    check_mode: true
-    register: present
-    failed_when:
   - name: test for byzantine conf files existence
     stat:
       path: "{{ item }}"
diff --git a/roles/cantaloupe/molecule/default/molecule.yml b/roles/cantaloupe/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/cantaloupe/molecule/default/molecule.yml
+++ b/roles/cantaloupe/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/datadog/molecule/default/molecule.yml b/roles/datadog/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/datadog/molecule/default/molecule.yml
+++ b/roles/datadog/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/deploy_user/molecule/default/molecule.yml b/roles/deploy_user/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/deploy_user/molecule/default/molecule.yml
+++ b/roles/deploy_user/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/dss/molecule/default/molecule.yml b/roles/dss/molecule/default/molecule.yml
index 233e40967e..6db13a25c9 100644
--- a/roles/dss/molecule/default/molecule.yml
+++ b/roles/dss/molecule/default/molecule.yml
@@ -5,7 +5,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/roles/dss/molecule/default/molecule.yml-e b/roles/dss/molecule/default/molecule.yml-e
deleted file mode 100644
index 976205e663..0000000000
--- a/roles/dss/molecule/default/molecule.yml-e
+++ /dev/null
@@ -1,32 +0,0 @@
----
-scenario:
-  name: default
-driver:
-  name: docker
-platforms:
-  - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
-    privileged: true
-    pre_build_image: true
-provisioner:
-  name: ansible
-  playbooks:
-    converge: playbooks.yml
-  log: true
-dependency:
-  name: galaxy
-  enabled: false
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
-verifier:
-  name: testinfra
-  env:
-    PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
-  lint:
-    name: flake8
-  options:
-    # show which tests where executed in test output
-    v: 1
-  directory: ./tests/
diff --git a/roles/example/molecule.yml b/roles/example/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/example/molecule.yml
+++ b/roles/example/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/extra_path/molecule/default/molecule.yml b/roles/extra_path/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/extra_path/molecule/default/molecule.yml
+++ b/roles/extra_path/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/ezproxy/tasks/main.yml b/roles/ezproxy/tasks/main.yml
index 4c479cbf16..128ea4d9fb 100644
--- a/roles/ezproxy/tasks/main.yml
+++ b/roles/ezproxy/tasks/main.yml
@@ -26,19 +26,10 @@
   when:
     - running_on_server
 
-- name: Ezproxy | install dependencies for 64bit
-  ansible.builtin.apt:
-    name: ["lib32ncurses5", "lib32z1"]
-    state: present
-  when:
-    - "'{{ ansible_distribution_release }}' == 'bionic'"
-
 - name: Ezproxy | install dependencies for 64bit
   ansible.builtin.apt:
     name: ["lib32ncurses6", "lib32z1"]
     state: present
-  when:
-    - "'{{ ansible_distribution_release }}' == 'jammy'"
 
 - name: Ezproxy | copy ezproxy config.txt
   ansible.builtin.template:
@@ -190,17 +181,6 @@
   changed_when: false
   when: running_on_server
 
-- name: Ezproxy | copy ezproxy init.d
-  ansible.builtin.copy:
-    src: "files/ezproxy"
-    dest: /etc/init.d/ezproxy
-    owner: root
-    group: root
-    mode: a+x
-  changed_when: false
-  when:
-    - "'{{ ansible_distribution_release }}' == 'bionic'"
-    - running_on_server
 
 - name: Ezproxy | add shib config user
   ansible.builtin.template:
@@ -220,7 +200,6 @@
     mode: a+x
   changed_when: false
   when:
-    - "'{{ ansible_distribution_release }}' == 'jammy'"
     - running_on_server
   notify: reload ezproxy
 
@@ -232,7 +211,6 @@
     group: root
     state: link
   when:
-    - "'{{ ansible_distribution_release }}' == 'jammy'"
     - running_on_server
 
 - name: Ezproxy | start ezproxy
diff --git a/roles/ffmpeg/molecule/default/molecule.yml b/roles/ffmpeg/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/ffmpeg/molecule/default/molecule.yml
+++ b/roles/ffmpeg/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/figgy_filewatcher_worker/molecule/default/molecule.yml b/roles/figgy_filewatcher_worker/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/figgy_filewatcher_worker/molecule/default/molecule.yml
+++ b/roles/figgy_filewatcher_worker/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/figgy_pubsub_worker/molecule/default/molecule.yml b/roles/figgy_pubsub_worker/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/figgy_pubsub_worker/molecule/default/molecule.yml
+++ b/roles/figgy_pubsub_worker/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/fits/molecule/default/molecule.yml b/roles/fits/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/fits/molecule/default/molecule.yml
+++ b/roles/fits/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/fits/molecule/default/molecule.yml-e b/roles/fits/molecule/default/molecule.yml-e
deleted file mode 100644
index 976205e663..0000000000
--- a/roles/fits/molecule/default/molecule.yml-e
+++ /dev/null
@@ -1,32 +0,0 @@
----
-scenario:
-  name: default
-driver:
-  name: docker
-platforms:
-  - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
-    privileged: true
-    pre_build_image: true
-provisioner:
-  name: ansible
-  playbooks:
-    converge: playbooks.yml
-  log: true
-dependency:
-  name: galaxy
-  enabled: false
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
-verifier:
-  name: testinfra
-  env:
-    PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
-  lint:
-    name: flake8
-  options:
-    # show which tests where executed in test output
-    v: 1
-  directory: ./tests/
diff --git a/roles/freetds/molecule/default/molecule.yml b/roles/freetds/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/freetds/molecule/default/molecule.yml
+++ b/roles/freetds/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/freetds/molecule/default/molecule.yml-e b/roles/freetds/molecule/default/molecule.yml-e
deleted file mode 100644
index 976205e663..0000000000
--- a/roles/freetds/molecule/default/molecule.yml-e
+++ /dev/null
@@ -1,32 +0,0 @@
----
-scenario:
-  name: default
-driver:
-  name: docker
-platforms:
-  - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
-    privileged: true
-    pre_build_image: true
-provisioner:
-  name: ansible
-  playbooks:
-    converge: playbooks.yml
-  log: true
-dependency:
-  name: galaxy
-  enabled: false
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
-verifier:
-  name: testinfra
-  env:
-    PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
-  lint:
-    name: flake8
-  options:
-    # show which tests where executed in test output
-    v: 1
-  directory: ./tests/
diff --git a/roles/friends_of_pul/molecule/default/molecule.yml b/roles/friends_of_pul/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/friends_of_pul/molecule/default/molecule.yml
+++ b/roles/friends_of_pul/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/geoserver/meta/main.yml b/roles/geoserver/meta/main.yml
index c383f424d6..18dfb8f714 100644
--- a/roles/geoserver/meta/main.yml
+++ b/roles/geoserver/meta/main.yml
@@ -18,4 +18,4 @@ galaxy_info:
 
 dependencies:
   - role: deploy_user
-  - role: tomcat8
+  - role: tomcat9
diff --git a/roles/geoserver/molecule/default/molecule.yml b/roles/geoserver/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/geoserver/molecule/default/molecule.yml
+++ b/roles/geoserver/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/geoserver/molecule/default/verify.yml b/roles/geoserver/molecule/default/verify.yml
index 691cb7f3ce..83cfb40fa5 100644
--- a/roles/geoserver/molecule/default/verify.yml
+++ b/roles/geoserver/molecule/default/verify.yml
@@ -5,7 +5,7 @@
   tasks:
   - name: test for geoserver war file
     stat:
-      path: "/var/lib/tomcat8/webapps/geoserver.war"
+      path: "/var/lib/tomcat9/webapps/geoserver.war"
     register: geoserv_file
     failed_when:
       - geoserv_file.stat.isreg is not defined
diff --git a/roles/geoserver/tasks/main.yml b/roles/geoserver/tasks/main.yml
index e0368532e0..421505e221 100644
--- a/roles/geoserver/tasks/main.yml
+++ b/roles/geoserver/tasks/main.yml
@@ -1,15 +1,17 @@
 ---
 - name: geoserver | stop tomcat server
   ansible.builtin.service:
-    name: tomcat8
+    name: tomcat9
     state: stopped
+  when: running_on_server
   changed_when: false
 
 - name: geoserver | unarchive war file
   ansible.builtin.unarchive:
     src: "{{ geoserver_url }}/{{ geoserver_version }}/{{ geoserver_file }}"
-    dest: /var/lib/tomcat8/webapps
+    dest: /var/lib/tomcat9/webapps
     remote_src: true
+  when: running_on_server
   notify:
     - restart tomcat
   changed_when: false
@@ -44,10 +46,10 @@
     force: true
   loop:
     - src: '/srv/shares/plum_geo_data'
-      link: '/var/lib/tomcat8/webapps/geoserver/data/plum_geo_data'
+      link: '/var/lib/tomcat9/webapps/geoserver/data/plum_geo_data'
     - src: '/srv/shares/figgy_geo_data'
-      link: '/var/lib/tomcat8/webapps/geoserver/data/figgy_geo_data'
+      link: '/var/lib/tomcat9/webapps/geoserver/data/figgy_geo_data'
     - src: '/mnt/libimages2/data/jp2s/plum_prod'
-      link: '/var/lib/tomcat8/webapps/geoserver/data/plum_prod'
+      link: '/var/lib/tomcat9/webapps/geoserver/data/plum_prod'
   when: running_on_server
   changed_when: false
diff --git a/roles/hr_share/molecule/default/molecule.yml b/roles/hr_share/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/hr_share/molecule/default/molecule.yml
+++ b/roles/hr_share/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/imagemagick/molecule/default/molecule.yml b/roles/imagemagick/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/imagemagick/molecule/default/molecule.yml
+++ b/roles/imagemagick/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/imagemagick/molecule/default/verify.yml b/roles/imagemagick/molecule/default/verify.yml
index 242b12210e..bb61035a35 100644
--- a/roles/imagemagick/molecule/default/verify.yml
+++ b/roles/imagemagick/molecule/default/verify.yml
@@ -1,18 +1,19 @@
 ---
 - name: Verify
   hosts: all
-  gather_facts: true
+  gather_facts: false
   tasks:
-  - name: test for imagemagick output
-    ansible.builtin.command: identify -list resource
-    register: identity_results
-    ignore_errors: true
-  - name: assert values for imagemagick
-    ansible.builtin.assert:
+  - name: check imagemagick package status
+    package:
+      name: "{{ item }}"
+      state: present
+    check_mode: true
+    register: pkg_status
+    loop:
+      - imagemagick
+
+  - name: test for imagemagick packages
+    assert:
       that:
-        - "'Disk: 8GiB' in identity_results.stdout"
-        - "'Memory: 2GiB' in identity_results.stdout"
-        - "'Map: 4GiB' in identity_results.stdout"
-        - "'Width: 214.7MP' in identity_results.stdout"
-        - "'Height: 214.7MP' in identity_results.stdout"
-        - "'Area: 1.0737GP' in identity_results.stdout"
+        - not pkg_status.changed
+
diff --git a/roles/kakadu/molecule/default/molecule.yml b/roles/kakadu/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/kakadu/molecule/default/molecule.yml
+++ b/roles/kakadu/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/lib_svn/molecule/default/molecule.yml b/roles/lib_svn/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/lib_svn/molecule/default/molecule.yml
+++ b/roles/lib_svn/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/lib_svn/tasks/main.yml b/roles/lib_svn/tasks/main.yml
index 4dd6a23ed1..423b428d8a 100644
--- a/roles/lib_svn/tasks/main.yml
+++ b/roles/lib_svn/tasks/main.yml
@@ -114,7 +114,7 @@
 
 - name: lib_svn | install apache modules
   ansible.builtin.apt:
-    name: ["libapache2-mod-svn", "libsvn-dev", "apache2-utils", "python-passlib"]
+    name: ["libapache2-mod-svn", "libsvn-dev", "apache2-utils", "python3-passlib"]
     state: present
 
 - name: lib_svn | install xmllint
diff --git a/roles/libstatic/molecule/default/molecule.yml b/roles/libstatic/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/libstatic/molecule/default/molecule.yml
+++ b/roles/libstatic/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/libwww/molecule/default/verify.yml b/roles/libwww/molecule/default/verify.yml
index 1c802aaa12..2867a60bc2 100644
--- a/roles/libwww/molecule/default/verify.yml
+++ b/roles/libwww/molecule/default/verify.yml
@@ -21,28 +21,6 @@
       register: present
       failed_when:
         - present is changed
-    - name: test for presence libwww apache config
-      lineinfile:
-        path: "/etc/apache2/sites-available/000-default.conf"
-        line: "{{ item }}"
-        state: present
-      loop:
-        - "Alias /utils /var/www/discoveryutils_cap/current/public"
-        - "DocumentRoot /var/www/library_cap/current"
-      check_mode: true
-      register: present
-      failed_when:
-    - name: test for presence libwww php ini
-      lineinfile:
-        path: "/etc/apache2/sites-available/000-default.conf"
-        line: "{{ item }}"
-        state: present
-      loop:
-        - "upload_max_filesize = 8M"
-        - "memory_limit = 256M"
-      check_mode: true
-      register: present
-      failed_when:
     - name: test for libwww conf files existence
       stat:
         path: "{{ item }}"
@@ -66,14 +44,3 @@
       register: present
       failed_when:
         - present is changed
-    - name: test for presence of updates in mpm_prefork.conf
-      lineinfile:
-        path: "/etc/apache2/mods-available/mpm_prefork.conf"
-        line: "{{ item }}"
-        state: present
-      loop:
-        - "\tMaxRequestWorkers\t388"
-        - "\tMaxConnectionsPerChild\t1000"
-      check_mode: true
-      register: present
-      failed_when:
diff --git a/roles/locator/molecule/default/molecule.yml b/roles/locator/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/locator/molecule/default/molecule.yml
+++ b/roles/locator/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/mailcatcher/molecule/default/molecule.yml b/roles/mailcatcher/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/mailcatcher/molecule/default/molecule.yml
+++ b/roles/mailcatcher/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/mediainfo/molecule/default/molecule.yml b/roles/mediainfo/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/mediainfo/molecule/default/molecule.yml
+++ b/roles/mediainfo/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/memcached/molecule/default/molecule.yml b/roles/memcached/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/memcached/molecule/default/molecule.yml
+++ b/roles/memcached/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/memcached/molecule/default/verify.yml b/roles/memcached/molecule/default/verify.yml
index c631cd3cea..318c667d4a 100644
--- a/roles/memcached/molecule/default/verify.yml
+++ b/roles/memcached/molecule/default/verify.yml
@@ -10,4 +10,4 @@
   - name: assert memcached version
     assert:
       that:
-        - "'memcached 1.5.6' in memcached_results.stdout"
+        - "'memcached 1.6.14' in memcached_results.stdout"
diff --git a/roles/memcached/tasks/main.yml b/roles/memcached/tasks/main.yml
index 1b8d416eee..916e805b87 100644
--- a/roles/memcached/tasks/main.yml
+++ b/roles/memcached/tasks/main.yml
@@ -29,4 +29,4 @@
   ansible.builtin.service: 
     name: memcached 
     state: started 
-    enabled: yes
+    enabled: true
diff --git a/roles/mudd/molecule/default/molecule.yml b/roles/mudd/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/mudd/molecule/default/molecule.yml
+++ b/roles/mudd/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/mysql/molecule/default/molecule.yml b/roles/mysql/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/mysql/molecule/default/molecule.yml
+++ b/roles/mysql/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/nfsserver/molecule/default/molecule.yml b/roles/nfsserver/molecule/default/molecule.yml
index 2ee57912cb..db6fc67f18 100644
--- a/roles/nfsserver/molecule/default/molecule.yml
+++ b/roles/nfsserver/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/nginxplus/molecule/default/molecule.yml b/roles/nginxplus/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/nginxplus/molecule/default/molecule.yml
+++ b/roles/nginxplus/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/nodejs/molecule/default/molecule.yml b/roles/nodejs/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/nodejs/molecule/default/molecule.yml
+++ b/roles/nodejs/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/pas/molecule/default/molecule.yml b/roles/pas/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/pas/molecule/default/molecule.yml
+++ b/roles/pas/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/pulfalight/molecule/default/molecule.yml b/roles/pulfalight/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/pulfalight/molecule/default/molecule.yml
+++ b/roles/pulfalight/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/recap_www/molecule/default/molecule.yml b/roles/recap_www/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/recap_www/molecule/default/molecule.yml
+++ b/roles/recap_www/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/repec/molecule/default/molecule.yml b/roles/repec/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/repec/molecule/default/molecule.yml
+++ b/roles/repec/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/resque_worker/molecule/default/molecule.yml b/roles/resque_worker/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/resque_worker/molecule/default/molecule.yml
+++ b/roles/resque_worker/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/ruby/molecule/default/molecule.yml b/roles/ruby/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/ruby/molecule/default/molecule.yml
+++ b/roles/ruby/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/ruby_s/molecule/default/molecule.yml b/roles/ruby_s/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/ruby_s/molecule/default/molecule.yml
+++ b/roles/ruby_s/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/samba/molecule/default/molecule.yml b/roles/samba/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/samba/molecule/default/molecule.yml
+++ b/roles/samba/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/saxon/meta/main.yml b/roles/saxon/meta/main.yml
index 33dcd451e8..f83ff7acfd 100644
--- a/roles/saxon/meta/main.yml
+++ b/roles/saxon/meta/main.yml
@@ -7,11 +7,11 @@ galaxy_info:
 
   license: MIT
 
-  min_ansible_version: 2.2
+  min_ansible_version: "2.2"
 
   platforms:
     - name: Ubuntu
       versions:
-        - 18.04
+        - bionic
 dependencies:
   - role: 'openjdk'
diff --git a/roles/saxon/molecule/default/converge.yml b/roles/saxon/molecule/default/converge.yml
index 0f79019594..097a0d37d3 100644
--- a/roles/saxon/molecule/default/converge.yml
+++ b/roles/saxon/molecule/default/converge.yml
@@ -2,6 +2,7 @@
 - name: Converge
   hosts: all
   vars:
+    - java_version: 17
     - running_on_server: false
   become: true
   pre_tasks:
diff --git a/roles/saxon/molecule/default/molecule.yml b/roles/saxon/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/saxon/molecule/default/molecule.yml
+++ b/roles/saxon/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/shared_data/molecule/default/molecule.yml b/roles/shared_data/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/shared_data/molecule/default/molecule.yml
+++ b/roles/shared_data/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/shibboleth/molecule/default/molecule.yml b/roles/shibboleth/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/shibboleth/molecule/default/molecule.yml
+++ b/roles/shibboleth/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/simple_annotation/molecule/default/molecule.yml b/roles/simple_annotation/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/simple_annotation/molecule/default/molecule.yml
+++ b/roles/simple_annotation/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/solrcloud/molecule/default/molecule.yml b/roles/solrcloud/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/solrcloud/molecule/default/molecule.yml
+++ b/roles/solrcloud/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/studio_proc/molecule/default/molecule.yml b/roles/studio_proc/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/studio_proc/molecule/default/molecule.yml
+++ b/roles/studio_proc/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/subversion/molecule/default/molecule.yml b/roles/subversion/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/subversion/molecule/default/molecule.yml
+++ b/roles/subversion/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/svn/molecule/default/molecule.yml b/roles/svn/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/svn/molecule/default/molecule.yml
+++ b/roles/svn/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/system_ldap/molecule/default/molecule.yml b/roles/system_ldap/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/system_ldap/molecule/default/molecule.yml
+++ b/roles/system_ldap/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/timezone/molecule/default/molecule.yml b/roles/timezone/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/timezone/molecule/default/molecule.yml
+++ b/roles/timezone/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/tomcat8/defaults/main.yml b/roles/tomcat8/defaults/main.yml
deleted file mode 100644
index 06710db402..0000000000
--- a/roles/tomcat8/defaults/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# defaults file for roles/tomcat8
-tomcat8_enabled: true
-tomcat8_hostname: localhost
-tomcat8_server_port: 8005
-tomcat8_catalina_port: 8983
-tomcat8_catalina_redirect_port: 8443
-tomcat_shutdown_port: "{{ tomcat8_server_port }}"
-tomcat_port: 8080
-tomcat_connection_timeout: 20000
-tomcat_redirect_port: "{{ tomcat8_catalina_redirect_port }}"
-tomcat_ajp_port: 8009
diff --git a/roles/tomcat8/tasks/main.yml b/roles/tomcat8/tasks/main.yml
deleted file mode 100644
index 442fce40ea..0000000000
--- a/roles/tomcat8/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: tomcat8 | ensure packages are installed
-  ansible.builtin.apt:
-    name: ["tomcat8"]
-    state: present
-
-- name: tomcat8 | copy config file
-  ansible.builtin.template:
-    src: server.xml.j2
-    dest: /etc/tomcat8/server.xml
-    mode: 0640
-
-- name: tomcat8 | ensure tomcat8 starts on boot
-  ansible.builtin.service:
-    name: tomcat8
-    state: started
-    enabled: true
-  changed_when: false
diff --git a/roles/tomcat8/vars/main.yml b/roles/tomcat8/vars/main.yml
deleted file mode 100644
index 3161df0d91..0000000000
--- a/roles/tomcat8/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for roles/tomcat8
diff --git a/roles/tomcat8/.ansible-lint b/roles/tomcat9/.ansible-lint
similarity index 100%
rename from roles/tomcat8/.ansible-lint
rename to roles/tomcat9/.ansible-lint
diff --git a/roles/tomcat8/.yamllint b/roles/tomcat9/.yamllint
similarity index 100%
rename from roles/tomcat8/.yamllint
rename to roles/tomcat9/.yamllint
diff --git a/roles/tomcat8/README.md b/roles/tomcat9/README.md
similarity index 77%
rename from roles/tomcat8/README.md
rename to roles/tomcat9/README.md
index 1ec331fb52..224b781559 100644
--- a/roles/tomcat8/README.md
+++ b/roles/tomcat9/README.md
@@ -1,7 +1,7 @@
 Role Name
 =========
 
-This role installs Apache Tomcat8
+This role installs Apache Tomcat9
 
 Role Variables
 --------------
@@ -21,5 +21,5 @@ Example Playbook
 
     - hosts: servers
       roles:
-         - { role: roles/tomcat8 }
+         - { role: roles/tomcat9 }
 
diff --git a/roles/tomcat9/defaults/main.yml b/roles/tomcat9/defaults/main.yml
new file mode 100644
index 0000000000..b56ff8ce96
--- /dev/null
+++ b/roles/tomcat9/defaults/main.yml
@@ -0,0 +1,12 @@
+---
+# defaults file for roles/tomcat9
+tomcat9_enabled: true
+tomcat9_hostname: localhost
+tomcat9_server_port: 8005
+tomcat9_catalina_port: 8983
+tomcat9_catalina_redirect_port: 8443
+tomcat_shutdown_port: "{{ tomcat9_server_port }}"
+tomcat_port: 8080
+tomcat_connection_timeout: 20000
+tomcat_redirect_port: "{{ tomcat8_catalina_redirect_port }}"
+tomcat_ajp_port: 8009
diff --git a/roles/tomcat8/handlers/main.yml b/roles/tomcat9/handlers/main.yml
similarity index 63%
rename from roles/tomcat8/handlers/main.yml
rename to roles/tomcat9/handlers/main.yml
index ac44b9c604..23b7fce62d 100644
--- a/roles/tomcat8/handlers/main.yml
+++ b/roles/tomcat9/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
-# handlers file for roles/tomcat8
+# handlers file for roles/tomcat9
 - name: restart tomcat
   ansible.builtin.service:
-    name: tomcat8
+    name: tomcat9
     state: restarted
   become: true
diff --git a/roles/tomcat8/meta/main.yml b/roles/tomcat9/meta/main.yml
similarity index 92%
rename from roles/tomcat8/meta/main.yml
rename to roles/tomcat9/meta/main.yml
index 232e3f933c..97dd23b387 100644
--- a/roles/tomcat8/meta/main.yml
+++ b/roles/tomcat9/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 galaxy_info:
-  role_name: tomcat8
+  role_name: tomcat9
   company: Princeton University Library
   description: Tomcat8 Role
   author: pulibrary
diff --git a/roles/tomcat8/molecule/default/INSTALL.rst b/roles/tomcat9/molecule/default/INSTALL.rst
similarity index 100%
rename from roles/tomcat8/molecule/default/INSTALL.rst
rename to roles/tomcat9/molecule/default/INSTALL.rst
diff --git a/roles/tomcat8/molecule/default/converge.yml b/roles/tomcat9/molecule/default/converge.yml
similarity index 83%
rename from roles/tomcat8/molecule/default/converge.yml
rename to roles/tomcat9/molecule/default/converge.yml
index 80f2bc031a..94634e5e0c 100644
--- a/roles/tomcat8/molecule/default/converge.yml
+++ b/roles/tomcat9/molecule/default/converge.yml
@@ -10,6 +10,6 @@
         update_cache: true
         cache_valid_time: 600
   tasks:
-    - name: "Include tomcat8"
+    - name: "Include tomcat9"
       ansible.builtin.include_role:
-        name: tomcat8
+        name: tomcat9
diff --git a/roles/tomcat8/molecule/default/molecule.yml b/roles/tomcat9/molecule/default/molecule.yml
similarity index 79%
rename from roles/tomcat8/molecule/default/molecule.yml
rename to roles/tomcat9/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/tomcat8/molecule/default/molecule.yml
+++ b/roles/tomcat9/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/tomcat8/molecule/default/verify.yml b/roles/tomcat9/molecule/default/verify.yml
similarity index 78%
rename from roles/tomcat8/molecule/default/verify.yml
rename to roles/tomcat9/molecule/default/verify.yml
index 2fe183d0a4..52f9ae1b44 100644
--- a/roles/tomcat8/molecule/default/verify.yml
+++ b/roles/tomcat9/molecule/default/verify.yml
@@ -3,16 +3,16 @@
   hosts: all
   gather_facts: false
   tasks:
-  - name: test for tomcat8 packages
+  - name: test for tomcat9 packages
     ansible.builtin.apt:
-      name: "tomcat8"
+      name: "tomcat9"
       state: present
     check_mode: true
     register: present
     failed_when:
       - present is changed
 
-  - name: tomcat8 listening on port 8080
+  - name: tomcat9 listening on port 8080
     ansible.builtin.command: netstat -tunlp | grep ":8080 " |grep java
     register: process
     changed_when: false
diff --git a/roles/tomcat9/tasks/main.yml b/roles/tomcat9/tasks/main.yml
new file mode 100644
index 0000000000..3f55b94702
--- /dev/null
+++ b/roles/tomcat9/tasks/main.yml
@@ -0,0 +1,18 @@
+---
+- name: tomcat9 | ensure packages are installed
+  ansible.builtin.apt:
+    name: ["tomcat9"]
+    state: present
+
+- name: tomcat9 | copy config file
+  ansible.builtin.template:
+    src: server.xml.j2
+    dest: /etc/tomcat9/server.xml
+    mode: 0640
+
+- name: tomcat9 | ensure tomcat9 starts on boot
+  ansible.builtin.service:
+    name: tomcat9
+    state: started
+    enabled: true
+  changed_when: false
diff --git a/roles/tomcat8/templates/server.xml.j2 b/roles/tomcat9/templates/server.xml.j2
similarity index 100%
rename from roles/tomcat8/templates/server.xml.j2
rename to roles/tomcat9/templates/server.xml.j2
diff --git a/roles/tomcat9/vars/main.yml b/roles/tomcat9/vars/main.yml
new file mode 100644
index 0000000000..632696fe73
--- /dev/null
+++ b/roles/tomcat9/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for roles/tomcat9
diff --git a/roles/zookeeper/molecule/default/molecule.yml b/roles/zookeeper/molecule/default/molecule.yml
index d186f778e9..0e1659c89a 100644
--- a/roles/zookeeper/molecule/default/molecule.yml
+++ b/roles/zookeeper/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ lint: |
   ansible-lint
 platforms:
   - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    image: "quay.io/pulibrary/jammy-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/roles/zookeeper/molecule/default/molecule.yml-e b/roles/zookeeper/molecule/default/molecule.yml-e
deleted file mode 100644
index 976205e663..0000000000
--- a/roles/zookeeper/molecule/default/molecule.yml-e
+++ /dev/null
@@ -1,32 +0,0 @@
----
-scenario:
-  name: default
-driver:
-  name: docker
-platforms:
-  - name: instance
-    image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
-    privileged: true
-    pre_build_image: true
-provisioner:
-  name: ansible
-  playbooks:
-    converge: playbooks.yml
-  log: true
-dependency:
-  name: galaxy
-  enabled: false
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
-verifier:
-  name: testinfra
-  env:
-    PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
-  lint:
-    name: flake8
-  options:
-    # show which tests where executed in test output
-    v: 1
-  directory: ./tests/