diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d195944fe0711b21e5a420f4f68c40acb6e2981e..6655c0b66164849e4a3a44f649fcd025029c49f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,13 +48,13 @@ build_image:
     - echo CRI_XCBC_HEAD=${CRI_XCBC_HEAD} | tee -a $CI_PROJECT_DIR/image.env
     - export BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d)
     - echo BUILD_DATE=${BUILD_DATE} | tee -a $CI_PROJECT_DIR/image.env
-    - s3cmd get --force --host=$AWS_HOST --host-bucket=$AWS_HOST s3://ood-config/group_vars/all CRI_XCBC/group_vars/prod
+    - s3cmd get --force --host=$AWS_HOST --host-bucket=$AWS_HOST s3://ood-config/group_vars/all CRI_XCBC/group_vars/knightly
     - s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/
-    - "echo '  ood_ssl_cert_file: \"knightly.rc.uab.edu-2048-incommon-cert.crt\"' >> CRI_XCBC/group_vars/prod"
-    - "echo '  ood_ssl_cert_key: \"knightly.rc.uab.edu-2048.key\"' >> CRI_XCBC/group_vars/prod"
-    - "echo '  ood_ssl_cert_chain_file: \"knightly.rc.uab.edu-2048-incommon-interm.crt\"' >> CRI_XCBC/group_vars/prod"
-    - "echo '  ood_ssl_s3_bucket: \"knightly-certs\"' >> CRI_XCBC/group_vars/prod"
-    - tail -n 10 CRI_XCBC/group_vars/prod
+    - "echo '  ood_ssl_cert_file: \"knightly.rc.uab.edu-2048-incommon-cert.crt\"' >> CRI_XCBC/group_vars/knightly"
+    - "echo '  ood_ssl_cert_key: \"knightly.rc.uab.edu-2048.key\"' >> CRI_XCBC/group_vars/knightly"
+    - "echo '  ood_ssl_cert_chain_file: \"knightly.rc.uab.edu-2048-incommon-interm.crt\"' >> CRI_XCBC/group_vars/knightly"
+    - "echo '  ood_ssl_s3_bucket: \"knightly-certs\"' >> CRI_XCBC/group_vars/knightly"
+    - tail -n 10 CRI_XCBC/group_vars/knightly
     - packer validate openstack-ood
     - >
       PKR_VAR_build_instance_name="ood-${CRI_XCBC_HEAD}"
diff --git a/openstack-ood/nodeimage.pkr.hcl b/openstack-ood/nodeimage.pkr.hcl
index cccce74a73154caf07f3c4dec94ca02faff28db3..2f3b2952d96da4b9275a1070f6ef94c1dc0dfa41 100644
--- a/openstack-ood/nodeimage.pkr.hcl
+++ b/openstack-ood/nodeimage.pkr.hcl
@@ -32,7 +32,7 @@ build {
   }
   provisioner "ansible" {
     user = var.ssh_username
-    groups = ["ood", "prod"]
+    groups = ["ood", "knightly"]
     ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"]
     playbook_file = "./CRI_XCBC/ood-packer.yaml"
   }