diff --git a/archive-doc-gen/scripts/auth_init.py b/archive-doc-gen/scripts/auth_init.py
index 8109f98f5..04cada19c 100644
--- a/archive-doc-gen/scripts/auth_init.py
+++ b/archive-doc-gen/scripts/auth_init.py
@@ -59,7 +59,7 @@ def add_client_secret(credential, app_id):
 
 
 def update_azd_env(name, val):
-    subprocess.run(f"azd env set {name} {val}", shell=True)
+    subprocess.run(["azd", "env", "set", name, val], shell=False, check=True)
 
 
 if __name__ == "__main__":
diff --git a/archive-doc-gen/scripts/data_preparation.py b/archive-doc-gen/scripts/data_preparation.py
index ee6fe379a..151b65f42 100644
--- a/archive-doc-gen/scripts/data_preparation.py
+++ b/archive-doc-gen/scripts/data_preparation.py
@@ -152,9 +152,15 @@ def create_or_update_search_index(
     if not admin_key:
         admin_key = json.loads(
             subprocess.run(
-                f"az search admin-key show --subscription {subscription_id} --resource-group {resource_group} --service-name {service_name}",
-                shell=True,
+                [
+                    "az", "search", "admin-key", "show",
+                    "--subscription", subscription_id,
+                    "--resource-group", resource_group,
+                    "--service-name", service_name
+                ],
+                shell=False,
                 capture_output=True,
+                check=True,
             ).stdout
         )["primaryKey"]
 
@@ -312,9 +318,15 @@ def upload_documents_to_index(
     if not admin_key:
         admin_key = json.loads(
             subprocess.run(
-                f"az search admin-key show --subscription {subscription_id} --resource-group {resource_group} --service-name {service_name}",
-                shell=True,
+                [
+                    "az", "search", "admin-key", "show",
+                    "--subscription", subscription_id,
+                    "--resource-group", resource_group,
+                    "--service-name", service_name
+                ],
+                shell=False,
                 capture_output=True,
+                check=True,
             ).stdout
         )["primaryKey"]
 
@@ -349,9 +361,15 @@ def validate_index(service_name, subscription_id, resource_group, index_name):
     api_version = "2024-03-01-Preview"
     admin_key = json.loads(
         subprocess.run(
-            f"az search admin-key show --subscription {subscription_id} --resource-group {resource_group} --service-name {service_name}",
-            shell=True,
+            [
+                "az", "search", "admin-key", "show",
+                "--subscription", subscription_id,
+                "--resource-group", resource_group,
+                "--service-name", service_name
+            ],
+            shell=False,
             capture_output=True,
+            check=True,
         ).stdout
     )["primaryKey"]