diff --git a/Core/.terraform.lock.hcl b/Core/.terraform.lock.hcl
index 82deb3ca..b8a053b8 100644
--- a/Core/.terraform.lock.hcl
+++ b/Core/.terraform.lock.hcl
@@ -6,6 +6,7 @@ provider "registry.terraform.io/hashicorp/archive" {
   hashes = [
     "h1:R/tcBtwBplwtaHRfLxk+LvOwx1KaoWHUlA6jvV5rys8=",
     "h1:cJokkjeH1jfpG4QEHdRx0t2j8rr52H33A7C/oX73Ok4=",
+    "h1:hyly5szqsEVCsd7qnaqtQogmVYueMv7OCUX8C+edTjg=",
     "zh:18e408596dd53048f7fc8229098d0e3ad940b92036a24287eff63e2caec72594",
     "zh:392d4216ecd1a1fd933d23f4486b642a8480f934c13e2cae3c13b6b6a7e34a7b",
     "zh:655dd1fa5ca753a4ace21d0de3792d96fff429445717f2ce31c125d19c38f3ff",
@@ -27,6 +28,7 @@ provider "registry.terraform.io/hashicorp/aws" {
   hashes = [
     "h1:+wJiCQKLEgY8a1ILFbebLgFX6q2xPJVV9wWp7eU2dsI=",
     "h1:6LWuf5/9oxAlw0jl7jh2V73d1RwKwGoFyGn3yTZbFSM=",
+    "h1:YKjeRfwNeh9mMOFgujxQuKqD/mt+scDQm8RpYVXdSGk=",
     "zh:3b58916e93cab4249bef6fcf6fb2ae3bbf0cb67a876e669205e1f785ffce88a4",
     "zh:5a51329c4d91ecdc2879a7d4acbc1dfd521ca6cd9a64f0d6f8c01d99a23fc98d",
     "zh:5c65414467db9b4bbf2f83fb1188543d1015514bab8a2336b38fcccb507fc7ca",
@@ -46,6 +48,7 @@ provider "registry.terraform.io/hashicorp/cloudinit" {
   version = "2.3.2"
   hashes = [
     "h1:2jb+BfT5T96dXxUD2LQ6MtVHpXErd7ZybmMvdWE2jd4=",
+    "h1:3/zH3rToB32NZuwlk4JEWwdtwK1mMuoif4d7OLTIwZY=",
     "h1:ocyv0lvfyvzW4krenxV5CL4Jq5DiA3EUfoy8DR6zFMw=",
     "zh:2487e498736ed90f53de8f66fe2b8c05665b9f8ff1506f751c5ee227c7f457d1",
     "zh:3d8627d142942336cf65eea6eb6403692f47e9072ff3fa11c3f774a3b93130b3",
@@ -65,6 +68,7 @@ provider "registry.terraform.io/hashicorp/cloudinit" {
 provider "registry.terraform.io/hashicorp/external" {
   version = "2.3.1"
   hashes = [
+    "h1:0/VG+zmBcGhAof8g5k9R7HYyotYs6KPqnQKnz6XBiAg=",
     "h1:3pi8UzZsZ0LH4fl7cglkLKkSXPPol8cugI1iqwNw+VA=",
     "h1:gznGscVJ0USxy4CdihpjRKPsKvyGr/zqPvBoFLJTQDc=",
     "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54",
@@ -87,6 +91,7 @@ provider "registry.terraform.io/hashicorp/local" {
   hashes = [
     "h1:7RnIbO3CFakblTJs7o0mUiY44dc9xGYsLhSNFSNS1Ds=",
     "h1:ZUEYUmm2t4vxwzxy1BvN1wL6SDWrDxfH7pxtzX8c6d0=",
+    "h1:sfyLOvWTFeT1dlRURlE2HpIUOOX9SB16Kgi6KPp0Oxs=",
     "zh:53604cd29cb92538668fe09565c739358dc53ca56f9f11312b9d7de81e48fab9",
     "zh:66a46e9c508716a1c98efbf793092f03d50049fa4a83cd6b2251e9a06aca2acf",
     "zh:70a6f6a852dd83768d0778ce9817d81d4b3f073fab8fa570bff92dcb0824f732",
@@ -105,6 +110,7 @@ provider "registry.terraform.io/hashicorp/local" {
 provider "registry.terraform.io/hashicorp/null" {
   version = "3.2.1"
   hashes = [
+    "h1:Tt3YZzWt6hurTE8+C2NQdDl70qDy5xyo9SDv2qymFdA=",
     "h1:vUW21lLLsKlxtBf0QF7LKJreKxs0CM7YXGzqW1N/ODY=",
     "h1:ydA0/SNRVB1o95btfshvYsmxA+jZFRZcvKzZSB+4S1M=",
     "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840",
@@ -125,6 +131,7 @@ provider "registry.terraform.io/hashicorp/null" {
 provider "registry.terraform.io/hashicorp/random" {
   version = "3.5.1"
   hashes = [
+    "h1:0ULxM8/DscMzfiDWg1yclBf/39U44wQmlx745BfYZ80=",
     "h1:3hjTP5tQBspPcFAJlfafnWrNrKnr7J4Cp0qB9jbqf30=",
     "h1:IL9mSatmwov+e0+++YX2V6uel+dV6bn+fC/cnGDK3Ck=",
     "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64",
@@ -145,6 +152,7 @@ provider "registry.terraform.io/hashicorp/random" {
 provider "registry.terraform.io/hashicorp/time" {
   version = "0.9.1"
   hashes = [
+    "h1:NDBCUogi8SVEFGCmoVP7VOU2KbnV7z2mUQF3pRyndoo=",
     "h1:VxyoYYOCaJGDmLz4TruZQTSfQhvwEcMxvcKclWdnpbs=",
     "h1:XYUT7lKAKuaHbCTp/WnjWBjz/C86JGvQUfS2s473Pjg=",
     "zh:00a1476ecf18c735cc08e27bfa835c33f8ac8fa6fa746b01cd3bcbad8ca84f7f",
diff --git a/Core/EC2/Ingest/templates/prc_install.sh.tftpl b/Core/EC2/Ingest/templates/prc_install.sh.tftpl
index 51ce9d9a..bfb88cfd 100644
--- a/Core/EC2/Ingest/templates/prc_install.sh.tftpl
+++ b/Core/EC2/Ingest/templates/prc_install.sh.tftpl
@@ -20,6 +20,6 @@ echo "Setting up HML Ingester Environment"
 (echo "${r_host}"; echo "${r_password}"; echo "${db_host}"; echo "${db_password}") | sudo ./update_configs.sh hydrovis.${environment}
 
 echo "Building HML Ingester Docker"
-sudo docker-compose -f docker-compose_hydrovis_${environment}.yml up --build -d
+sudo DOCKER_BUILDKIT=0 docker-compose -f docker-compose_hydrovis_${environment}.yml up --build -d
 
 echo "Finished Setup"
\ No newline at end of file
diff --git a/Core/ImageBuilder/Pipelines/linux/main.tf b/Core/ImageBuilder/Pipelines/linux/main.tf
index bd876e9d..1ab3fb84 100644
--- a/Core/ImageBuilder/Pipelines/linux/main.tf
+++ b/Core/ImageBuilder/Pipelines/linux/main.tf
@@ -213,28 +213,6 @@ resource "aws_imagebuilder_component" "logging_setup" {
       {
         name = "build"
         steps = [
-          {
-            name   = "upgrade_rsyslog"
-            action = "ExecuteBash"
-            inputs = {
-              commands = [
-                "echo \"Upgrading Rsyslog\"",
-                <<-EOT
-                sudo tee /etc/yum.repos.d/rsyslog-daily-epel.repo<<EOF
-                [rsyslog_v8_daily]
-                name=Adiscon CentOS-7 - daily packages for x86_64
-                baseurl=http://rpms.adiscon.com/v8-stable-daily/epel-7/x86_64
-                enabled=1
-                gpgcheck=0
-                gpgkey=https://rpms.adiscon.com/RPM-GPG-KEY-Adiscon
-                protect=1
-                EOF
-                EOT
-                ,
-                "yum upgrade rsyslog --disablerepo=amzn2-core -y",
-              ]
-            }
-          },
           {
             name   = "add_docker_log_driver"
             action = "ExecuteBash"
@@ -262,12 +240,14 @@ resource "aws_imagebuilder_component" "logging_setup" {
                 echo "Adding Rsyslog Destination Config"
                 sudo tee /etc/rsyslog.d/01-docker-logs.conf<<'EOF'
 
+                set $.app_name=getenv("HYDROVIS_APPLICATION");
+
                 template(name="dockerjson" type="list") {
                   constant(value="{")
                     constant(value="\"@timestamp\":\"")        property(name="timereported" dateFormat="rfc3339")
                     constant(value="\",\"host\":\"")           property(name="hostname")
                     constant(value="\",\"programname\":\"")    property(name="programname")
-                    constant(value="\",\"application\":\"")    constant(value=`echo $HYDROVIS_APPLICATION`)
+                    constant(value="\",\"application\":\"")    property(name="$.app_name")
                     constant(value="\",\"container_name\":\"") property(name="syslogtag" regex.type="ERE" regex.submatch="1" regex.expression="docker\\/(.+)\\[[0-9]+]")
                     constant(value="\",\"message\":\"")        property(name="msg" format="json")
                   constant(value="\"}\n")
diff --git a/Core/main.tf b/Core/main.tf
index ed42f21c..27d1c449 100644
--- a/Core/main.tf
+++ b/Core/main.tf
@@ -10,7 +10,7 @@ terraform {
     key                     = "state"
     region                  = "us-east-1"
     profile                 = "prod"
-    shared_credentials_file = "/cloud/aws/credentials"
+    shared_credentials_files = ["/cloud/aws/credentials"]
   }
 }