diff --git a/dual-master/cf-cluster.yml b/dual-master/cf-cluster.yml
index f2bb08c..fd39589 100644
--- a/dual-master/cf-cluster.yml
+++ b/dual-master/cf-cluster.yml
@@ -145,7 +145,6 @@
           done; (exit $s)
           mkdir -p $DIR_TGT/git
           mkdir -p $DIR_TGT/high-availability
-          mkdir -p $DIR_TGT/events
           chown -R 1000:1000 $DIR_TGT
           cp -p /etc/fstab /etc/fstab.back-$(date +%F)
           echo -e \"$DIR_SRC:/ \t\t $DIR_TGT \t\t nfs \t\t defaults \t\t 0 \t\t 0\" | tee -a /etc/fstab
diff --git a/dual-master/cf-service-master.yml b/dual-master/cf-service-master.yml
index 77c867f..1f61c3b 100644
--- a/dual-master/cf-service-master.yml
+++ b/dual-master/cf-service-master.yml
@@ -161,7 +161,6 @@
   Gerrit:
     Volume:
       Git: gerrit-git-master
-      Events: gerrit-events-master
       Websessions: gerrit-ha-websessions-master
       Data: gerrit-data-master
       Index: gerrit-index-master
@@ -300,8 +299,6 @@
                       ContainerPath: /var/gerrit/db
                     - SourceVolume: !Join ['-', [!FindInMap ['Gerrit', 'Volume', 'Logs'], !Ref 'GerritInstanceNumber']]
                       ContainerPath: /var/gerrit/logs
-                    - SourceVolume: !Join ['-', [!FindInMap ['Gerrit', 'Volume', 'Events'], !Ref 'GerritInstanceNumber']]
-                      ContainerPath: /var/gerrit/events
                   Cpu: !Ref GerritCPU
                   Memory: !Ref GerritRAM
                   PortMappings:
@@ -321,9 +318,6 @@
               - Name: !FindInMap ['Gerrit', 'Volume', 'Git']
                 Host:
                   SourcePath: "/mnt/efs/gerrit-shared/git"
-              - Name: !Join ['-', [!FindInMap ['Gerrit', 'Volume', 'Events'], !Ref 'GerritInstanceNumber']]
-                Host:
-                  SourcePath: "/mnt/efs/gerrit-shared/events"
               - Name: !FindInMap ['Gerrit', 'Volume', 'Websessions']
                 Host:
                   SourcePath: "/mnt/efs/gerrit-shared/high-availability"
diff --git a/gerrit/etc/replication.config.template b/gerrit/etc/replication.config.template
index 94ef52f..f2216a3 100644
--- a/gerrit/etc/replication.config.template
+++ b/gerrit/etc/replication.config.template
@@ -1,8 +1,6 @@
 [replication]
   lockErrorMaxRetries = 30
   maxRetries = 30
-  eventsDirectory = events
-  distributionInterval = 1
 
 [gerrit]
   autoReload = true