diff --git a/tutoraspects/patches/openedx-common-settings b/tutoraspects/patches/openedx-common-settings
index 79c1416a3..94ca91073 100644
--- a/tutoraspects/patches/openedx-common-settings
+++ b/tutoraspects/patches/openedx-common-settings
@@ -59,3 +59,10 @@ EVENT_BUS_PRODUCER_CONFIG.update(
 if not "openedx_events" in INSTALLED_APPS:
 	INSTALLED_APPS.append("openedx_events")
 {% endif %}
+
+
+{% for model in EVENT_SINK_MODELS_ENABLED %}
+EVENT_SINK_CLICKHOUSE_{{model.upper()}}_ENABLED = True{% endfor %}
+{% if ASPECTS_ENABLE_PII %}# User PII models
+{% for model in EVENT_SINK_PII_MODELS %}EVENT_SINK_CLICKHOUSE_{{model.upper()}}_ENABLED = True
+{% endfor %}{% endif %}
\ No newline at end of file
diff --git a/tutoraspects/templates/aspects/jobs/init/lms/init-lms.sh b/tutoraspects/templates/aspects/jobs/init/lms/init-lms.sh
index 69cf40d80..7e323948d 100644
--- a/tutoraspects/templates/aspects/jobs/init/lms/init-lms.sh
+++ b/tutoraspects/templates/aspects/jobs/init/lms/init-lms.sh
@@ -36,13 +36,3 @@ EOF
 ./manage.py lms manage_user tutor-contrib-aspects aspects@axim --unusable-password
 ./manage.py lms populate_model -f /tmp/erb_config.json -u tutor-contrib-aspects
 {% endif %}
-
-{% for model in EVENT_SINK_MODELS_ENABLED %}
-(./manage.py lms waffle_flag --list | grep event_sink_clickhouse.{{model}}.enabled) || ./manage.py lms waffle_flag --create event_sink_clickhouse.{{model}}.enabled --everyone
-{% endfor %}
-
-{% if ASPECTS_ENABLE_PII %}
-  {% for model in EVENT_SINK_PII_MODELS %}
-(./manage.py lms waffle_flag --list | grep event_sink_clickhouse.{{model}}.enabled) || ./manage.py lms waffle_flag --create event_sink_clickhouse.{{model}}.enabled --everyone
-  {% endfor %}
-{% endif %}