diff --git a/example_configs/bert-eqa-query.yaml b/example_configs/bert-eqa-query.yaml
new file mode 100644
index 0000000..b23dd86
--- /dev/null
+++ b/example_configs/bert-eqa-query.yaml
@@ -0,0 +1,18 @@
+deployment: !Deployment
+  destination: aws
+  # Endpoint name matches model_id for querying atm.
+  endpoint_name: huggingface-eqa-bert-base-cased
+  instance_count: 1
+  instance_type: ml.m5.xlarge
+
+models:
+- !Model
+  # Base model id that was finetuned
+  id: huggingface-eqa-bert-base-cased
+  source: custom
+
+  # local or S3 path
+  location: ./models/model.tar.gz
+query: !Query
+  # Query to send to the model
+  text: "What is the capital of France?"
\ No newline at end of file
diff --git a/magemaker/runner.py b/magemaker/runner.py
index 6de523e..6d8cc2e 100644
--- a/magemaker/runner.py
+++ b/magemaker/runner.py
@@ -161,11 +161,19 @@ def runner():
         help="Show magemaker version and exit"
     )
 
+    parser.add_argument(
+        '--query',
+        action='query',
+        help="path to YAML query configuration file",
+        type=str
+    )
+
     parser.add_argument(
         "--hf",
         help="Deploy a Hugging Face Model.",
         type=str
     )
+
     parser.add_argument(
         "--instance",
         help="EC2 instance type to deploy to.",