diff --git a/docker-compose.yml b/docker-compose.yml
index 30b4017e4..c459bfdb1 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - NOJEMALLOC
       - WITHASAN
       - BLD_NAME
+      - PROXYSQLGENAI
     command: bash -l -c /opt/entrypoint/entrypoint.bash
 
 ####################################################################################################
diff --git a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
index 8184c1fc9..d35e3c9c7 100755
--- a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
@@ -44,7 +44,11 @@ fi
 # clean is expensive, do it before, outside of container
 #${MAKE} cleanbuild
 ${MAKE} ${MAKEOPT} ${deps_target}
-${MAKE} ${MAKEOPT} ${build_target}
+if [[ "${PROXYSQLGENAI:-}" == "1" ]]; then
+    ${MAKE} ${MAKEOPT} PROXYSQLGENAI=1 ${build_target}
+else
+    ${MAKE} ${MAKEOPT} ${build_target}
+fi
 
 touch /opt/proxysql/src/proxysql
 
diff --git a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
index cb01d915b..08505cc82 100755
--- a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
@@ -44,7 +44,11 @@ fi
 # clean is expensive, do it before, outside of container
 #${MAKE} cleanbuild
 ${MAKE} ${MAKEOPT} ${deps_target}
-${MAKE} ${MAKEOPT} ${build_target}
+if [[ "${PROXYSQLGENAI:-}" == "1" ]]; then
+    ${MAKE} ${MAKEOPT} PROXYSQLGENAI=1 ${build_target}
+else
+    ${MAKE} ${MAKEOPT} ${build_target}
+fi
 
 touch /opt/proxysql/src/proxysql
 
diff --git a/docker/images/proxysql/suse-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/suse-compliant/entrypoint/entrypoint.bash
index d4162ce16..6381e6eef 100755
--- a/docker/images/proxysql/suse-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/suse-compliant/entrypoint/entrypoint.bash
@@ -44,7 +44,11 @@ fi
 # clean is expensive, do it before, outside of container
 #${MAKE} cleanbuild
 ${MAKE} ${MAKEOPT} ${deps_target}
-${MAKE} ${MAKEOPT} ${build_target}
+if [[ "${PROXYSQLGENAI:-}" == "1" ]]; then
+    ${MAKE} ${MAKEOPT} PROXYSQLGENAI=1 ${build_target}
+else
+    ${MAKE} ${MAKEOPT} ${build_target}
+fi
 
 touch /opt/proxysql/src/proxysql