diff --git a/tools/gen-oslo-openstack-helm/Dockerfile b/tools/gen-oslo-openstack-helm/Dockerfile
index ffe818d34a..0dcace93b4 100644
--- a/tools/gen-oslo-openstack-helm/Dockerfile
+++ b/tools/gen-oslo-openstack-helm/Dockerfile
@@ -23,7 +23,8 @@ RUN set -x \
     && rm get-pip.py \
     && pip install \
         oslo.config \
-        tox
+        tox \
+        crudini
 
 COPY generate.py /opt/gen-oslo-openstack-helm/generate.py
 COPY entrypoint.sh /entrypoint.sh
diff --git a/tools/gen-oslo-openstack-helm/entrypoint.sh b/tools/gen-oslo-openstack-helm/entrypoint.sh
index 7d48014d36..2c288cade8 100755
--- a/tools/gen-oslo-openstack-helm/entrypoint.sh
+++ b/tools/gen-oslo-openstack-helm/entrypoint.sh
@@ -3,11 +3,19 @@ set -xe
 
 git clone --depth 1 --branch ${PROJECT_BRANCH} ${PROJECT_REPO} /tmp/${PROJECT}
 cd /tmp/${PROJECT}
+
+
+TOX_VENV_DIR=$(crudini --get tox.ini testenv:genconfig envdir | sed 's|^{toxworkdir}|.tox|')
+if [ -z "$TOX_VENV_DIR" ]
+then
+      TOX_VENV_DIR=".tox/genconfig"
+fi
+GENCONFIG_FLAGS=$(crudini --get tox.ini testenv:genconfig commands | sed 's/^oslo-config-generator//')
+
 tox -egenconfig
 
-source .tox/genconfig/bin/activate
+source ${TOX_VENV_DIR}/bin/activate
 
-python /opt/gen-oslo-openstack-helm/generate.py \
-  --config-file config-generator/${PROJECT}.conf \
-  --helm_chart ${PROJECT} \
-  --helm_namespace ${PROJECT}
+python /opt/gen-oslo-openstack-helm/generate.py ${GENCONFIG_FLAGS} \
+    --helm_chart ${PROJECT} \
+    --helm_namespace ${PROJECT}