diff --git a/terraform/implementation/ecs/main.tf b/terraform/implementation/ecs/main.tf
index 0bf1f03..0ce246d 100644
--- a/terraform/implementation/ecs/main.tf
+++ b/terraform/implementation/ecs/main.tf
@@ -23,4 +23,7 @@ module "ecs" {
   owner   = var.owner
   project = var.project
   tags    = local.tags
+
+  # If intent is to use the non-integrated viewer, set this to true (default is false)
+  # non_integrated_viewer = "true"
 }
diff --git a/terraform/modules/ecs/_local.tf b/terraform/modules/ecs/_local.tf
index cc6c6c1..4834d9d 100644
--- a/terraform/modules/ecs/_local.tf
+++ b/terraform/modules/ecs/_local.tf
@@ -45,8 +45,15 @@ locals {
         {
           name  = "APP_ENV",
           value = "test"
+        },
+        {
+          name  = "NODE_ENV",
+          value = var.node_env
+        },
+        {
+          name = "NEXT_PUBLIC_BASEPATH",
+          value = var.ecr_viewer_basepath
         }
-
       ]
     },
     fhir-converter = {
@@ -148,7 +155,7 @@ locals {
         },
         {
           name  = "ECR_VIEWER_URL",
-          value = "http://ecr-viewer:3000"
+          value = "http://ecr-viewer:3000${var.ecr_viewer_basepath}"
         },
         {
           name  = "MESSAGE_PARSER_URL",
diff --git a/terraform/modules/ecs/_variable.tf b/terraform/modules/ecs/_variable.tf
index ed3c02f..61663df 100644
--- a/terraform/modules/ecs/_variable.tf
+++ b/terraform/modules/ecs/_variable.tf
@@ -99,7 +99,7 @@ variable "s3_viewer_bucket_role_name" {
 variable "phdi_version" {
   type        = string
   description = "Version of the PHDI application"
-  default     = "v1.6.1"
+  default     = "v1.6.4"
 }
 
 variable "service_data" {
@@ -156,4 +156,16 @@ variable "non_integrated_viewer" {
   type        = string
   description = "A flag to determine if the viewer is the non-integrated version"
   default     = "false"
+}
+
+variable "node_env" {
+  type        = string
+  description = "The app node environment"
+  default     = "production"
+}
+
+variable "ecr_viewer_basepath" {
+  type        = string
+  description = "The basepath for the ecr-viewer"
+  default     = "/ecr-viewer"
 }
\ No newline at end of file