diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index bb56baf..6012ee1 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -109,6 +109,19 @@ tasks:
       - func: "execute tests"
 
 buildvariants:
+  - name: test-llama-index-kvstore-rhel
+    # TODO - Maintainer has pushed back on this.
+    display_name: LlamaIndex RHEL KV Store
+    expansions:
+      DIR: llama-index-python-kvstore
+      REPO_NAME: llama_index
+      # TODO - Update CLONE_URL: [PYTHON-4522] [INTPYTHON-326]
+      CLONE_URL: -b PYTHON-4522 --single-branch https://github.com/shruti-sridhar/llama_index.git
+      DATABASE: llama_index_test_db
+    run_on:
+      - rhel87-small
+    tasks:
+      - name: test-llama-index
   - name: test-semantic-kernel-python-rhel
     display_name: Semantic-Kernel RHEL Python
     expansions:
@@ -150,27 +163,13 @@ buildvariants:
     expansions:
       DIR: chatgpt-retrieval-plugin
       REPO_NAME: chatgpt-retrieval-plugin
-      # TODO - Update CLONE_URL: [PYTHON-4291] [PYTHON-4129]
-      CLONE_URL: -b bugfix/broken-link-in-readme --single-branch https://github.com/caseyclements/chatgpt-retrieval-plugin.git
+      CLONE_URL: https://github.com/openai/chatgpt-retrieval-plugin.git
       DATABASE: chatgpt_retrieval_plugin_test_db
     run_on:
       - rhel87-small
     tasks:
       - name: test-chatgpt-retrieval-plugin
 
-  - name: test-llama-index-kvstore-rhel
-    display_name: LlamaIndex RHEL KV Store
-    expansions:
-      DIR: llama-index-python-kvstore
-      REPO_NAME: llama_index
-      # TODO - Update CLONE_URL: [PYTHON-4522]
-      CLONE_URL: -b PYTHON-4522 --single-branch https://github.com/shruti-sridhar/llama_index.git
-      DATABASE: llama_index_test_db
-    run_on:
-      - rhel87-small
-    tasks:
-      - name: test-llama-index
-
   - name: test-llama-index-vectorstore-rhel
     display_name: LlamaIndex RHEL Vector Store
     expansions:
diff --git a/chatgpt-retrieval-plugin/run.sh b/chatgpt-retrieval-plugin/run.sh
index cf19c7c..4445ed0 100644
--- a/chatgpt-retrieval-plugin/run.sh
+++ b/chatgpt-retrieval-plugin/run.sh
@@ -24,7 +24,7 @@ $PYTHON_BINARY -m poetry install --with dev
 # Run tests. Sensitive variables in Evergreen come from Evergeen project: ai-ml-pipeline-testing/
 # shellcheck disable=SC2154
 OPENAI_API_KEY=$openai_api_key \
-DATASTORE="mongodb-atlas" \
+DATASTORE="mongodb" \
 BEARER_TOKEN="staylowandkeepmoving" \
 MONGODB_URI=$chatgpt_retrieval_plugin_mongodb_uri \
 MONGODB_DATABASE="chatgpt_retrieval_plugin_test_db" \