diff --git a/dual-primary/Makefile b/dual-primary/Makefile
index c79a3c9..6c4a479 100644
--- a/dual-primary/Makefile
+++ b/dual-primary/Makefile
@@ -17,7 +17,7 @@
 HA_SITE_PLUGINS=$(SINGLE_SITE_PLUGINS) aws-dynamodb-refdb
 HA_SITE_PLUGINS_LIBS_LINKS=high-availability
 
-MULTI_SITE_PLUGINS=$(SINGLE_SITE_PLUGINS) multi-site kafka-events websession-broker
+MULTI_SITE_PLUGINS=$(SINGLE_SITE_PLUGINS) multi-site events-kafka websession-broker
 MULTI_SITE_PLUGINS_LIBS_LINKS=multi-site replication
 MULTI_SITE_MAVEN_LIBS=events-broker~$(EVENTSBROKER_LIB_VER)
 
diff --git a/gerrit/entrypoint.sh b/gerrit/entrypoint.sh
index 4aa5446..edc5117 100755
--- a/gerrit/entrypoint.sh
+++ b/gerrit/entrypoint.sh
@@ -10,7 +10,7 @@
 
   echo "Ensure primary specific plugins and libraries are not installed:"
   for jar in "lib/multi-site.jar" "plugins/multi-site.jar" "lib/replication.jar" \
-    "lib/events-broker.jar" "plugins/kafka-events.jar" "plugins/aws-dynamodb-refdb.jar" \
+    "lib/events-broker.jar" "plugins/events-kafka.jar" "plugins/aws-dynamodb-refdb.jar" \
     "plugins/websession-broker.jar" "plugins/high-availability.jar" "lib/high-availability.jar"
   do
     echo "rm -f /var/gerrit/$jar"
diff --git a/gerrit/etc/gerrit.config.template b/gerrit/etc/gerrit.config.template
index e48ab86..40f5789 100644
--- a/gerrit/etc/gerrit.config.template
+++ b/gerrit/etc/gerrit.config.template
@@ -104,7 +104,7 @@
 
 {% endif %}
 {% if MULTISITE_ENABLED is defined and MULTISITE_ENABLED == "true" %}
-[plugin "kafka-events"]
+[plugin "events-kafka"]
     sendAsync = true
     bootstrapServers = {{ MULTISITE_KAFKA_BROKERS }}
     groupId = {{ GERRIT_INSTANCE_ID }}