diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml
index 048f65ea0..ab92e0d0f 100644
--- a/.github/workflows/dsf_poc_cli_azure.yml
+++ b/.github/workflows/dsf_poc_cli_azure.yml
@@ -188,8 +188,8 @@ jobs:
         PATH_TO_DRA_ANALYTICS_VHD="DRA-${{ github.event.inputs.product_full_version }}_x86_64-Analytics.vhd"
         PATH_TO_DRA_ADMIN_VHD="DRA-${{ github.event.inputs.product_full_version }}_x86_64-Admin.vhd"
         else
-        PATH_TO_DRA_ANALYTICS_VHD="DRA-4.17.0.10.0.6_31077_x86_64-Analytics.vhd"
-        PATH_TO_DRA_ADMIN_VHD="DRA-4.17.0.10.0.6_31077_x86_64-Admin.vhd"
+        PATH_TO_DRA_ANALYTICS_VHD="DRA-4.18.0.10.0.12_31582_x86_64-Analytics.vhd"
+        PATH_TO_DRA_ADMIN_VHD="DRA-4.18.0.10.0.12_31582_x86_64-Admin.vhd"
         fi
         
         if [ "${{ github.event.inputs.deployment_type }}" == "sonar" ] && [ "${{ github.event.inputs.product_full_version }}" != "latest" ] && [ -n "${{ github.event.inputs.product_full_version }}" ]; then  
diff --git a/README.md b/README.md
index 6c603a74b..af2e1b367 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ This guide references the following information and links, some of which are ava
 
    <a href="https://docs.imperva.com/bundle/z-kb-articles-knowledgebase-dt/page/393216754.html">DAM v14.17</a>
 
-   <a href="https://docs.imperva.com/bundle/z-kb-articles-knowledgebase-dt/page/290722037.html">DRA v4.17</a>
+   <a href="https://docs.imperva.com/bundle/z-kb-articles-knowledgebase-dt/page/389415621.html">DRA v4.18</a>
    </td>
    <td>DSF Components Overview
    </td>
@@ -576,6 +576,15 @@ The following table lists the _latest_ DSF Kit releases, their release date and
       Improvements and bug fixes
     </td>
   </tr>
+  <tr>
+    <td>TBD
+    </td>
+    <td>1.7.29
+    </td>
+    <td>
+      Added internal support for DRA version 4.18. Set the variable ‘dra_version’ to 4.18 to use it.
+    </td>
+  </tr>
   
 </table>
 
@@ -778,7 +787,7 @@ Restrictions on modules may apply</td>
 
   </tr>
   <tr>
-    <td>DRA</td><td>4.17.0.10</td><td>4.11.0.10 and up</td>
+    <td>DRA</td><td>4.17.0.10</td><td>4.11.0.10 - 4.18.0.10</td>
   </tr>
 </table>
 
diff --git a/modules/aws/core/globals/main.tf b/modules/aws/core/globals/main.tf
index 6561d4979..df3f8c0ab 100644
--- a/modules/aws/core/globals/main.tf
+++ b/modules/aws/core/globals/main.tf
@@ -45,6 +45,9 @@ locals {
 
 locals {
   dra_version_map = {
+    "4.18"      = "4.18.0.10.0.12",
+    "4.18.0.10" = "4.18.0.10.0.12",
+    
     "4.17"      = "4.17.0.10.0.6",
     "4.17.0.10" = "4.17.0.10.0.6",