diff --git a/.github/workflows/_containerTemplate.yml b/.github/workflows/_containerTemplate.yml
index 30dd41c..e2bd83f 100644
--- a/.github/workflows/_containerTemplate.yml
+++ b/.github/workflows/_containerTemplate.yml
@@ -37,7 +37,7 @@ on:
 jobs:
   deployment:
     name: Container Build & Push
-    runs-on: [windows-2019]
+    runs-on: [windows-2022]
     continue-on-error: false
     environment: ${{ inputs.environment }}
 
@@ -56,7 +56,7 @@ jobs:
       - name: Login Container Registry
         id: registry_login
         uses: docker/login-action@v3.3.0
-        if: github.event_name != 'pull_request'
+        # if: github.event_name != 'pull_request'
         with:
           registry: ${{ inputs.registry_uri }}
           username: ${{ secrets.USER_NAME }}
@@ -87,6 +87,6 @@ jobs:
             --build-arg="INSTALL_JDK=true" `
             --tag ${{ steps.metadata.outputs.tags }} .
 
-          if( "${{ github.event_name != 'pull_request' }}" -eq "true" ) {
+          if( "${{ github.event_name == 'pull_request' }}" -eq "true" ) {
             docker push ${{ steps.metadata.outputs.tags }}
           }
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index be6f0aa..7d3cb05 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -6,6 +6,7 @@ on:
     paths:
       - "**.tf"
       - "code/infra/**"
+      - "config/**"
       - ".github/workflows/terraform.yml"
 
   pull_request:
@@ -14,6 +15,7 @@ on:
     paths:
       - "**.tf"
       - "code/infra/**"
+      - "config/**"
       - ".github/workflows/terraform.yml"
 
 jobs:
diff --git a/code/container/Dockerfile b/code/container/Dockerfile
index d5c4910..213a328 100644
--- a/code/container/Dockerfile
+++ b/code/container/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
 ARG INSTALL_JDK=false
 
 # Download the latest self-hosted integration runtime installer into the SHIR folder
diff --git a/code/container/SHIR/build.ps1 b/code/container/SHIR/build.ps1
index f1de84c..077141b 100644
--- a/code/container/SHIR/build.ps1
+++ b/code/container/SHIR/build.ps1
@@ -19,7 +19,7 @@ function Install-SHIR() {
 
         # Temporarily disable progress updates to speed up the download process. (See https://stackoverflow.com/questions/69942663/invoke-webrequest-progress-becomes-irresponsive-paused-while-downloading-the-fil)
         $ProgressPreference = 'SilentlyContinue'
-        Invoke-WebRequest -Uri 'https://go.microsoft.com/fwlink/?linkid=839822&clcid=0x409' -OutFile "C:\SHIR\$MsiFileName"
+        Invoke-WebRequest -Uri 'https://download.microsoft.com/download/e/4/7/e4771905-1079-445b-8bf9-8a1a075d8a10/IntegrationRuntime_5.50.9162.1.msi' -OutFile "C:\SHIR\$MsiFileName"
         $ProgressPreference = 'Continue'
     }
 
diff --git a/code/infra/terraform.tf b/code/infra/terraform.tf
index 03fc6d5..573bbe2 100644
--- a/code/infra/terraform.tf
+++ b/code/infra/terraform.tf
@@ -4,11 +4,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.21.1"
+      version = "4.22.0"
     }
     azapi = {
       source  = "azure/azapi"
-      version = "2.2.0"
+      version = "2.3.0"
     }
     time = {
       source  = "hashicorp/time"
diff --git a/config/PerfectThymeTech/vars.tfvars b/config/PerfectThymeTech/vars.tfvars
index b0f623a..bdd3869 100644
--- a/config/PerfectThymeTech/vars.tfvars
+++ b/config/PerfectThymeTech/vars.tfvars
@@ -10,7 +10,7 @@ log_analytics_workspace_id = "/subscriptions/e82c5267-9dc4-4f45-ac13-abdd5e130d2
 # SHIR variables
 
 # Container variables
-container_image_reference = "ghcr.io/perfectthymetech/shiragentazure:main"
+container_image_reference = "ghcr.io/perfectthymetech/shiragentazure:pr-6"
 
 # Network variables
 vnet_id                          = "/subscriptions/1fdab118-1638-419a-8b12-06c9543714a0/resourceGroups/ptt-dev-networking-rg/providers/Microsoft.Network/virtualNetworks/spoke-ptt-dev-vnet001"