diff --git a/devbox/devbox.local/cli/devbox b/devbox/cli/devbox
similarity index 99%
rename from devbox/devbox.local/cli/devbox
rename to devbox/cli/devbox
index 2a4a6c9..4f279eb 100644
--- a/devbox/devbox.local/cli/devbox
+++ b/devbox/cli/devbox
@@ -122,7 +122,7 @@ devbox_init_guidance() {
         exit 1
       fi
 
-      printf "Repository connection successful.\n"
+      printf "Repository connection successfully.\n"
 
       add_arg "--use-custom-repository" "$use_custom_repository"
       ;;
@@ -592,7 +592,6 @@ get_port() {
       break
     fi
   done
-  echo "$port"
 }
 
 # Build the local image
@@ -1103,7 +1102,7 @@ if [[ $USE_LOCAL_COMPONENT_VAL == true  ]]; then
 
       # Start Gitea, MongoDB, RabbitMQ and other components containers
       echo "===> start Gitea, MongoDB, RabbitMQ and other components containers"
-      docker-compose -f docker-compose.dev.arm64.new.yaml up -d mongodb rabbitmq gitea redis "${start_components[@]}"
+      docker-compose -f docker-compose.yaml up -d mongodb rabbitmq gitea redis "${start_components[@]}"
 
       gitea_container_id=$(docker ps --no-trunc -a --filter "name=^freeleaps2-gitea$" --format "{{.ID}}")
       echo "$gitea_container_id" > "$WORKING_HOME/.gitea-instance"
@@ -1145,7 +1144,7 @@ else
   echo ' ===> Using online components for Freeleaps services.'
   echo '============================================'
   # Start Gitea, MongoDB, RabbitMQ containers
-  docker-compose -f docker-compose.dev.arm64.new.yaml up -d mongodb rabbitmq redis
+  docker-compose -f docker-compose.yaml up -d mongodb rabbitmq redis
 
   # Save MongoDB and RabbitMQ container ids to .mongodb-instance and .rabbitmq-instance
   mongo_container_id=$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-mongodb\$")
@@ -2420,7 +2419,6 @@ parse_requirements() {
     "")
       devbox_init_guidance >&2
       action="init"
-      shift
       devbox_init_parse_requirements "$@"
       shift $#
       ;;
diff --git a/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml b/devbox/cli/docker-compose.yaml
similarity index 100%
rename from devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml
rename to devbox/cli/docker-compose.yaml
diff --git a/devbox/devbox.local/cli/gitea_data_backup.tar.gz b/devbox/cli/gitea_data_backup.tar.gz
similarity index 100%
rename from devbox/devbox.local/cli/gitea_data_backup.tar.gz
rename to devbox/cli/gitea_data_backup.tar.gz