diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index daf7c3a446..1a720ccba8 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -20,7 +20,7 @@ jobs:
       WITH_DOCKER: no
       CI: true
       WITH_IMAGE_VIX: "0"
-      ENABLE_AI: "0"
+      WITH_AI: "0"
       EXQLITE_USE_SYSTEM: 1
       EXQLITE_SYSTEM_CFLAGS: -I/usr/include
       EXQLITE_SYSTEM_LDFLAGS: -L/lib -lsqlite3
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 1719d29a59..6be0685029 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -24,7 +24,7 @@ jobs:
       ERLANG_VERSION: "27.1.2"
       ELIXIR_VERSION: "1.17.3"
       # TODO: read these ^ from .tool-versions.env
-      ENABLE_AI: "0"
+      WITH_AI: "0"
       WITH_LV_NATIVE: "0"
       WITH_IMAGE_VIX: "0"
       # ^ TEMP workaround for evision_nif crash on app start
@@ -96,7 +96,7 @@ jobs:
           #  ghcr.io/bonfire-networks/bonfire-app:latest-${{ env.FLAVOUR }}${{ matrix.tag_extra }}
           #  ghcr.io/bonfire-networks/bonfire-app:${{steps.version.outputs.current-version}}-${{ env.FLAVOUR }}${{ matrix.tag_extra }}
           build-args: |
-            "ENABLE_AI=${{ env.ENABLE_AI }}"
+            "WITH_AI=${{ env.WITH_AI }}"
             "WITH_LV_NATIVE=${{ env.WITH_LV_NATIVE }}"
             "WITH_IMAGE_VIX=${{ env.WITH_IMAGE_VIX }}"
             "ALPINE_VERSION=${{ env.ALPINE_VERSION }}"
@@ -118,7 +118,7 @@ jobs:
       WITH_DOCKER: no
       MIX_ENV: prod
       TERM: linux
-      ENABLE_AI: 0
+      WITH_AI: 0
       WITH_LV_NATIVE: 0
     steps:
       - 
diff --git a/flavours/classic/config/templates/not_secret.env b/flavours/classic/config/templates/not_secret.env
index d464e7cbd0..237f861542 100644
--- a/flavours/classic/config/templates/not_secret.env
+++ b/flavours/classic/config/templates/not_secret.env
@@ -47,4 +47,4 @@ MAPBOX_API_KEY=pk.eyJ1IjoibWF5ZWwiLCJhIjoiY2tlMmxzNXF5MGFpaDJ0bzR2M29id2EzOCJ9.Q
 
 WITH_LV_NATIVE=0
 WITH_IMAGE_VIX=1
-ENABLE_AI=0
+WITH_AI=0
diff --git a/flavours/classic/config/templates/public.env b/flavours/classic/config/templates/public.env
index b04ae4869f..ac53f791de 100644
--- a/flavours/classic/config/templates/public.env
+++ b/flavours/classic/config/templates/public.env
@@ -28,5 +28,5 @@ REPLACE_OS_VARS=true
 LIVEVIEW_ENABLED=true
 WITH_LV_NATIVE=0
 WITH_IMAGE_VIX=0 
-ENABLE_AI=0
+WITH_AI=0
 SHOW_DEBUG_IN_DEV=true
diff --git a/justfile b/justfile
index 20e8a1a123..6100911a55 100644
--- a/justfile
+++ b/justfile
@@ -732,7 +732,7 @@ rel-build-path FORKS_TO_COPY_PATH ARGS="":
 		--build-arg FLAVOUR_PATH=data/current_flavour \
 		--build-arg WITH_IMAGE_VIX=$WITH_IMAGE_VIX \
 		--build-arg WITH_LV_NATIVE=$WITH_LV_NATIVE \
-		--build-arg ENABLE_AI=$ENABLE_AI \
+		--build-arg WITH_AI=$WITH_AI \
 		--build-arg ALPINE_VERSION=$ALPINE_VERSION \
 		--build-arg ELIXIR_DOCKER_IMAGE=$ELIXIR_DOCKER_IMAGE \
 		--build-arg FORKS_TO_COPY_PATH={{ FORKS_TO_COPY_PATH }} \
diff --git a/mix.exs b/mix.exs
index ae5fc23685..6c0c1ea038 100644
--- a/mix.exs
+++ b/mix.exs
@@ -41,7 +41,7 @@ defmodule Bonfire.Umbrella.MixProject do
                      else: []
                    )
 
-  @maybe_ai if(System.get_env("ENABLE_AI") != "0",
+  @maybe_ai if(System.get_env("WITH_AI") != "0",
               do: [
                 {:bumblebee, "~> 0.6.0"},
                 {:nx, "~> 0.9.0"},