diff --git a/.github/workflows/sonar_upgrade.yml b/.github/workflows/sonar_upgrade.yml
index 82744a56..7975a0d2 100644
--- a/.github/workflows/sonar_upgrade.yml
+++ b/.github/workflows/sonar_upgrade.yml
@@ -61,11 +61,11 @@ jobs:
       DEPLOYMENT_EXAMPLE_DIR: ./examples/aws/poc/dsf_deployment
       UPGRADE_EXAMPLE_DIR: ./examples/aws/sonar_upgrade
       AWS_REGION: eu-west-2
-      SONAR_TARGET_VERSION: 4.16.0.20.0
+      SONAR_TARGET_VERSION: 4.17.0.10.0
       TF_VAR_enable_sonar: ${{ matrix.enable_sonar }}
       TF_VAR_enable_dam: ${{ matrix.enable_dam }}
       TF_VAR_enable_dra: ${{ matrix.enable_dra }}
-      TF_VAR_sonar_version: 4.14.0.20
+      TF_VAR_sonar_version: 4.15.0.20
       TF_VAR_hub_hadr: ${{ matrix.hub_hadr }}
       TF_VAR_agentless_gw_hadr: ${{ matrix.agentless_gw_hadr }}
       TF_VAR_simulation_db_types_for_agentless: ${{ matrix.simulation_db_types_for_agentless }}
diff --git a/examples/aws/installation/dsf_single_account_deployment/variables.tf b/examples/aws/installation/dsf_single_account_deployment/variables.tf
index 1bb78978..708a7775 100644
--- a/examples/aws/installation/dsf_single_account_deployment/variables.tf
+++ b/examples/aws/installation/dsf_single_account_deployment/variables.tf
@@ -227,7 +227,7 @@ variable "dra_analytics_key_pair" {
 
 variable "sonar_version" {
   type        = string
-  default     = "4.16"
+  default     = "4.17"
   description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch."
   validation {
     condition     = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.")
diff --git a/examples/aws/installation/sonar_multi_account_deployment/variables.tf b/examples/aws/installation/sonar_multi_account_deployment/variables.tf
index 29354683..be196386 100644
--- a/examples/aws/installation/sonar_multi_account_deployment/variables.tf
+++ b/examples/aws/installation/sonar_multi_account_deployment/variables.tf
@@ -12,7 +12,7 @@ variable "deployment_name" {
 
 variable "sonar_version" {
   type        = string
-  default     = "4.16"
+  default     = "4.17"
   description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch."
   validation {
     condition     = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.")
diff --git a/examples/aws/installation/sonar_single_account_deployment/variables.tf b/examples/aws/installation/sonar_single_account_deployment/variables.tf
index c36cc8d3..9826089b 100644
--- a/examples/aws/installation/sonar_single_account_deployment/variables.tf
+++ b/examples/aws/installation/sonar_single_account_deployment/variables.tf
@@ -22,7 +22,7 @@ variable "aws_region" {
 
 variable "sonar_version" {
   type        = string
-  default     = "4.16"
+  default     = "4.17"
   description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch."
   validation {
     condition     = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.")
diff --git a/examples/aws/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf
index d78a59af..99d4a53e 100644
--- a/examples/aws/poc/dsf_deployment/variables.tf
+++ b/examples/aws/poc/dsf_deployment/variables.tf
@@ -214,7 +214,7 @@ variable "dam_agent_installation_location" {
 
 variable "sonar_version" {
   type        = string
-  default     = "4.16"
+  default     = "4.17"
   description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch."
   validation {
     condition     = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.")
diff --git a/examples/aws/poc/sonar_basic_deployment/variables.tf b/examples/aws/poc/sonar_basic_deployment/variables.tf
index bdeb4120..6aab87a9 100644
--- a/examples/aws/poc/sonar_basic_deployment/variables.tf
+++ b/examples/aws/poc/sonar_basic_deployment/variables.tf
@@ -12,7 +12,7 @@ variable "deployment_name" {
 
 variable "sonar_version" {
   type        = string
-  default     = "4.16"
+  default     = "4.17"
   description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch."
   validation {
     condition     = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.")
diff --git a/examples/aws/poc/sonar_hadr_deployment/variables.tf b/examples/aws/poc/sonar_hadr_deployment/variables.tf
index 283b6389..001ac49d 100644
--- a/examples/aws/poc/sonar_hadr_deployment/variables.tf
+++ b/examples/aws/poc/sonar_hadr_deployment/variables.tf
@@ -12,7 +12,7 @@ variable "deployment_name" {
 
 variable "sonar_version" {
   type        = string
-  default     = "4.16"
+  default     = "4.17"
   description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch."
   validation {
     condition     = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.")
diff --git a/examples/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf
index 9c94a573..07d4c886 100644
--- a/examples/azure/poc/dsf_deployment/variables.tf
+++ b/examples/azure/poc/dsf_deployment/variables.tf
@@ -176,7 +176,7 @@ variable "simulation_db_types_for_agent" {
 
 variable "sonar_version" {
   type        = string
-  default     = "4.16"
+  default     = "4.17"
   description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch."
   validation {
     condition     = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.")
diff --git a/modules/aws/core/globals/main.tf b/modules/aws/core/globals/main.tf
index 1e0f94cc..31d831d5 100644
--- a/modules/aws/core/globals/main.tf
+++ b/modules/aws/core/globals/main.tf
@@ -1,5 +1,8 @@
 locals {
   sonar_tarball_s3_key_map = {
+    "4.17"      = "jsonar-4.17.0.10.0.tar.gz"
+    "4.17.0.10" = "jsonar-4.17.0.10.0.tar.gz"
+
     "4.16"      = "jsonar-4.16.0.20.0.tar.gz"
     "4.16.0.20" = "jsonar-4.16.0.20.0.tar.gz"