diff --git a/terraform/aws-constellation/variables.tf b/terraform/aws-constellation/variables.tf
index 54a6e2a2fdf..e5a6312493e 100644
--- a/terraform/aws-constellation/variables.tf
+++ b/terraform/aws-constellation/variables.tf
@@ -1,10 +1,6 @@
 variable "name" {
   type        = string
   description = "Name of your Constellation"
-  validation {
-    condition     = length(var.name) <= 10
-    error_message = "The length of the name of the Constellation must be <= 10 characters"
-  }
 }
 
 variable "image" {
diff --git a/terraform/constellation-cluster/install-constellation.sh b/terraform/constellation-cluster/install-constellation.sh
index dcafe4dfea3..a7067167db0 100755
--- a/terraform/constellation-cluster/install-constellation.sh
+++ b/terraform/constellation-cluster/install-constellation.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
-VERSION="latest"
-if ! command -v constellation &> /dev/null; then
+if ! [ -f ./constellation ]; then
   OS=$(uname -s)
   ARCH=$(uname -m)
-
+  VERSION="latest"
   URL=""
 
   if [[ $OS == "Darwin" ]]; then
@@ -21,10 +20,9 @@ if ! command -v constellation &> /dev/null; then
   fi
 
   if [ -z "$URL" ]; then
-    echo "Unsupported OS or architecture"
+    echo "OS \"$OS\" and/or architecture \"$ARCH\" is not supported."
     exit 1
   else
     curl -o constellation -LO $URL
-    sudo install constellation /usr/local/bin/constellation
   fi
 fi
diff --git a/terraform/constellation-cluster/main.tf b/terraform/constellation-cluster/main.tf
index d2be3a7539d..cd07ca121d6 100644
--- a/terraform/constellation-cluster/main.tf
+++ b/terraform/constellation-cluster/main.tf
@@ -39,7 +39,6 @@ resource "terraform_data" "config_generate" {
 
 # TODO how to handle CSP specific config without CSP specific input?
 resource "terraform_data" "csp_config" {
-  count = var.csp == "aws" ? 1 : 0
   provisioner "local-exec" {
     command = <<EOT
       if [ "${var.csp}" == "aws" ]; then
@@ -70,7 +69,7 @@ resource "terraform_data" "config" {
   }
 
   depends_on = [
-    terraform_data.config_generate
+    terraform_data.config_generate, terraform_data.csp_config
   ]
 }
 
@@ -103,6 +102,6 @@ resource "terraform_data" "apply" {
   }
 
   depends_on = [
-    terraform_data.infra_state, terraform_data.config
+    terraform_data.infra_state, terraform_data.config, terraform_data.ensure_cli
   ]
 }