diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentClass.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentClass.java
index 40d9a5cc..a666f4e3 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentClass.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentClass.java
@@ -30,7 +30,7 @@ public class ComponentClass {
     private static final String TCG_COMPONENT_REGISTRY = "2.23.133.18.3.1";
     private static final String SMBIOS_COMPONENT_REGISTRY = "2.23.133.18.3.3";
     private static final Path JSON_PATH = FileSystems.getDefault()
-            .getPath("/opt", "hirs", "default-properties", "component-class.json");
+            .getPath("/etc", "hirs/aca", "default-properties", "component-class.json");
 
     private static final String OTHER_STRING = "Other";
     private static final String UNKNOWN_STRING = "Unknown";
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java
index 5530258c..7ceecdc0 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java
@@ -24,7 +24,7 @@ public class UefiGuid {
     private static final int UUID_EPOCH_DIVISOR = 10000;
 
     private static final Path JSON_PATH = FileSystems.getDefault().getPath("/opt",
-            "hirs", "default-properties", "vendor-table.json");
+            "hirs/aca", "default-properties", "vendor-table.json");
     private JsonObject uefiVendorRef;
     /**
      * guid byte array.
diff --git a/package/scripts/aca/aca_setup.sh b/package/scripts/aca/aca_setup.sh
index 9cb7483b..bf685637 100755
--- a/package/scripts/aca/aca_setup.sh
+++ b/package/scripts/aca/aca_setup.sh
@@ -6,6 +6,9 @@ LOG_FILE_NAME="hirs_aca_install_"$(date +%Y-%m-%d).log
 LOG_DIR="/var/log/hirs/"
 LOG_FILE="$LOG_DIR$LOG_FILE_NAME"
 HIRS_PROP_DIR="/opt/hirs/default-properties"
+HIRS_JSON_DIR="/etc/hirs/aca/default-properties"
+COMP_JSON='../../../HIRS_AttestationCA/src/main/resources/component-class.json'
+VENDOR_TABLE='../../../HIRS_AttestationCA/src/main/resources/vendor-table.json'
 
 help () {
   echo "  Setup script for the HIRS ACA"
@@ -55,7 +58,10 @@ done
 
 set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
 
-mkdir -p $HIRS_CONF_DIR $LOG_DIR $HIRS_PROP_DIR
+mkdir -p $HIRS_CONF_DIR $LOG_DIR $HIRS_PROP_DIR $HIRS_JSON_DIR
+
+cp -n $COMP_JSON $HIRS_JSON_DIR/
+cp -n $VENDOR_TABLE $HIRS_JSON_DIR/
 
 echo "ACA setup log file is $LOG_FILE"