diff --git a/.github/workflows/docker-push-main.yml b/.github/workflows/docker-push-main.yml
index a1009b61..53a5435f 100644
--- a/.github/workflows/docker-push-main.yml
+++ b/.github/workflows/docker-push-main.yml
@@ -5,8 +5,8 @@ env:
 
 on:
   push:
-    # branches:
-    #   - main
+    branches:
+      - main
 
 jobs:
   # Build ARM64 image on native ARM64 runner
diff --git a/.github/workflows/ghrc-push-main.yml b/.github/workflows/ghrc-push-main.yml
index 8ec7dfdb..288b9df9 100644
--- a/.github/workflows/ghrc-push-main.yml
+++ b/.github/workflows/ghrc-push-main.yml
@@ -5,7 +5,7 @@ env:
 
 on:
   push:
-  #   branches: [main]
+    branches: [main]
 
 jobs:
   build-arm64:
diff --git a/arch/tools/cli/main.py b/arch/tools/cli/main.py
index 84cc2c79..a457f363 100644
--- a/arch/tools/cli/main.py
+++ b/arch/tools/cli/main.py
@@ -34,12 +34,12 @@ log = getLogger(__name__)
 
 # ref https://patorjk.com/software/taag/#p=display&f=Doom&t=Plano&x=none&v=4&h=4&w=80&we=false
 logo = r"""
-______ _                   
-| ___ \ |                  
-| |_/ / | __ _ _ __   ___  
-|  __/| |/ _` | '_ \ / _ \ 
+______ _
+| ___ \ |
+| |_/ / | __ _ _ __   ___
+|  __/| |/ _` | '_ \ / _ \
 | |   | | (_| | | | | (_) |
-\_|   |_|\__,_|_| |_|\___/ 
+\_|   |_|\__,_|_| |_|\___/
 
 """
 
diff --git a/demos/use_cases/model_alias_routing/arch_config_with_aliases.yaml b/demos/use_cases/model_alias_routing/config_with_aliases.yaml
similarity index 100%
rename from demos/use_cases/model_alias_routing/arch_config_with_aliases.yaml
rename to demos/use_cases/model_alias_routing/config_with_aliases.yaml
diff --git a/tests/e2e/arch_config_memory_state_v1_responses.yaml b/tests/e2e/config_memory_state_v1_responses.yaml
similarity index 100%
rename from tests/e2e/arch_config_memory_state_v1_responses.yaml
rename to tests/e2e/config_memory_state_v1_responses.yaml
diff --git a/tests/e2e/run_e2e_tests.sh b/tests/e2e/run_e2e_tests.sh
index a6e66121..0606f5f7 100644
--- a/tests/e2e/run_e2e_tests.sh
+++ b/tests/e2e/run_e2e_tests.sh
@@ -6,15 +6,15 @@ set -e
 
 print_disk_usage
 
-mkdir -p ~/archgw_logs
-touch ~/archgw_logs/modelserver.log
+mkdir -p ~/plano_logs
+touch ~/plano_logs/modelserver.log
 
 print_debug() {
   log "Received signal to stop"
   log "Printing debug logs for docker"
   log "===================================="
   tail -n 100 ../build.log
-  archgw logs --debug | tail -n 100
+  plano logs --debug | tail -n 100
 }
 
 trap 'print_debug' INT TERM ERR
@@ -27,7 +27,7 @@ cd ../../demos/samples_python/weather_forecast/
 docker compose up weather_forecast_service --build -d
 cd -
 
-log building and installing archgw cli
+log building and installing plano cli
 log ==================================
 cd ../../arch/tools
 poetry install
@@ -36,7 +36,7 @@ cd -
 log building docker image for arch gateway
 log ======================================
 cd ../../
-archgw build
+plano build
 cd -
 
 # Once we build archgw we have to install the dependencies again to a new virtual environment.
@@ -44,8 +44,8 @@ poetry install
 
 log startup arch gateway with function calling demo
 cd ../../
-archgw down
-archgw up demos/samples_python/weather_forecast/arch_config.yaml
+plano down
+plano up demos/samples_python/weather_forecast/config.yaml
 cd -
 
 log running e2e tests for prompt gateway
@@ -54,11 +54,11 @@ poetry run pytest test_prompt_gateway.py
 
 log shutting down the arch gateway service for prompt_gateway demo
 log ===============================================================
-archgw down
+plano down
 
 log startup arch gateway with model alias routing demo
 cd ../../
-archgw up demos/use_cases/model_alias_routing/arch_config_with_aliases.yaml
+plano up demos/use_cases/model_alias_routing/config_with_aliases.yaml
 cd -
 
 log running e2e tests for model alias routing
@@ -70,8 +70,8 @@ log ========================================
 poetry run pytest test_openai_responses_api_client.py
 
 log startup arch gateway with state storage for openai responses api client demo
-archgw down
-archgw up arch_config_memory_state_v1_responses.yaml
+plano down
+plano up config_memory_state_v1_responses.yaml
 
 log running e2e tests for openai responses api client
 log ========================================