diff --git a/scripts/deploy-manager.sh b/scripts/deploy-manager.sh
index 9e823a2b..31411589 100755
--- a/scripts/deploy-manager.sh
+++ b/scripts/deploy-manager.sh
@@ -72,6 +72,11 @@ fi
 wait_for_container_healthy 60 kolla-ansible
 wait_for_container_healthy 60 osism-ansible
 
+# disable ara service
+if [[ -e /etc/osism-ci-image || "$ARA" == "false" ]]; then
+    sh -c '/opt/configuration/scripts/disable-ara.sh'
+fi
+
 # gather facts
 osism apply gather-facts
 
diff --git a/scripts/disable-ara.sh b/scripts/disable-ara.sh
index 5110e62a..2f9282e0 100755
--- a/scripts/disable-ara.sh
+++ b/scripts/disable-ara.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 for name in ceph-ansible kolla-ansible osism-ansible osism-kubernetes; do
-    [[ ! -z "$(docker ps -a | grep $name )" ]] && docker exec -t $name mv /ansible/ara.env /ansible/ara.env.disabled || echo "ARA in $name already disabled."
+    [[ ! -z "$(docker ps -a | grep $name )" ]] && docker exec -t $name bash -c "mv /ansible/ara.env /ansible/ara.env.disabled 2>/dev/null" || echo "ARA in $name already disabled."
 done
diff --git a/scripts/enable-ara.sh b/scripts/enable-ara.sh
index c2219b62..7c77a761 100755
--- a/scripts/enable-ara.sh
+++ b/scripts/enable-ara.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 for name in ceph-ansible kolla-ansible osism-ansible osism-kubernetes; do
-    [[ ! -z "$(docker ps -a | grep $name )" ]] && docker exec -t $name mv /ansible/ara.env.disabled /ansible/ara.env || echo "ARA in $name already enabled."
+    [[ ! -z "$(docker ps -a | grep $name )" ]] && docker exec -t $name bash -c "mv /ansible/ara.env.disabled /ansible/ara.env  2>/dev/null" || echo "ARA in $name already enabled."
 done
diff --git a/terraform/environments/ci-centos-stream-9.tfvars b/terraform/environments/ci-centos-stream-9.tfvars
index 7e47299c..2b73e28a 100644
--- a/terraform/environments/ci-centos-stream-9.tfvars
+++ b/terraform/environments/ci-centos-stream-9.tfvars
@@ -15,3 +15,4 @@ network_availability_zone = "nova"
 volume_availability_zone  = "nova"
 public                    = "public"
 number_of_nodes           = 6
+ara                       = false
diff --git a/terraform/environments/ci-debian-12.tfvars b/terraform/environments/ci-debian-12.tfvars
index 7f69ad21..37b7db20 100644
--- a/terraform/environments/ci-debian-12.tfvars
+++ b/terraform/environments/ci-debian-12.tfvars
@@ -15,3 +15,4 @@ network_availability_zone = "nova"
 volume_availability_zone  = "nova"
 public                    = "public"
 number_of_nodes           = 6
+ara                       = false
diff --git a/terraform/environments/ci-ubuntu-22.04.tfvars b/terraform/environments/ci-ubuntu-22.04.tfvars
index cc6a5fc2..c3f6213d 100644
--- a/terraform/environments/ci-ubuntu-22.04.tfvars
+++ b/terraform/environments/ci-ubuntu-22.04.tfvars
@@ -15,3 +15,4 @@ network_availability_zone = "nova"
 volume_availability_zone  = "nova"
 public                    = "public"
 number_of_nodes           = 6
+ara                       = false
diff --git a/terraform/environments/ci-ubuntu-24.04.tfvars b/terraform/environments/ci-ubuntu-24.04.tfvars
index 7820cbad..bbf276e1 100644
--- a/terraform/environments/ci-ubuntu-24.04.tfvars
+++ b/terraform/environments/ci-ubuntu-24.04.tfvars
@@ -15,3 +15,4 @@ network_availability_zone = "nova"
 volume_availability_zone  = "nova"
 public                    = "public"
 number_of_nodes           = 6
+ara                       = false