diff --git a/ansible/playbooks/roles/kafka/tasks/upgrade/set-updated-version.yml b/ansible/playbooks/roles/kafka/tasks/upgrade/set-updated-version.yml
index 6014cb41f6..c6c064cc69 100644
--- a/ansible/playbooks/roles/kafka/tasks/upgrade/set-updated-version.yml
+++ b/ansible/playbooks/roles/kafka/tasks/upgrade/set-updated-version.yml
@@ -7,7 +7,7 @@
   lineinfile:
     path: /opt/kafka/config/server.properties
     regexp: "^inter.broker.protocol.version"
-    line: "inter.broker.protocol.version={{ kafka_version.new }}"
+    line: "inter.broker.protocol.version={{ kafka_version }}"
 
 - name: Start kafka service
   include_tasks: common/start.yml
diff --git a/ansible/playbooks/roles/kafka/tasks/upgrade/update-properties.yml b/ansible/playbooks/roles/kafka/tasks/upgrade/update-properties.yml
index 7d4b1923e9..f16499aa7a 100644
--- a/ansible/playbooks/roles/kafka/tasks/upgrade/update-properties.yml
+++ b/ansible/playbooks/roles/kafka/tasks/upgrade/update-properties.yml
@@ -11,7 +11,7 @@
 - name: Add current_kafka_version property
   lineinfile:
     path: /opt/kafka/config/server.properties
-    line: "CURRENT_KAFKA_VERSION={{ kafka_version.old }}"
+    line: "CURRENT_KAFKA_VERSION={{ old_kafka_version }}"
   when: current_kafka_version_property.stdout == ""
 
 - name: Check if inter.broker.protocol.version property is defined
@@ -26,5 +26,5 @@
 - name: Add inter.broker.protocol.version property
   lineinfile:
     path: /opt/kafka/config/server.properties
-    line: "inter.broker.protocol.version={{ kafka_version.old }}"
+    line: "inter.broker.protocol.version={{ old_kafka_version }}"
   when: inter_broker_protocol_version_property.stdout == ""
diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md
index 4fa2a727f3..def2760a37 100644
--- a/docs/changelogs/CHANGELOG-2.0.md
+++ b/docs/changelogs/CHANGELOG-2.0.md
@@ -32,11 +32,8 @@
 - [#2966](https://github.com/epiphany-platform/epiphany/issues/2966) - `epicli init --full` does not generate configuration for OpenDistro
 - [#2942](https://github.com/epiphany-platform/epiphany/issues/2942) - rsync command fails trying to copy artifacts
 - [#2930](https://github.com/epiphany-platform/epiphany/issues/2930) - Backup/recovery commands fail when default configuration for backup attached to cluster-config.yml
-<<<<<<< HEAD
 - [#2989](https://github.com/epiphany-platform/epiphany/issues/2989) - Task `Remove swap from /etc/fstab` does not remove swap entry from file
-=======
 - [#2803](https://github.com/epiphany-platform/epiphany/issues/2803) - Refactor: rename 'kafka_var' setting
->>>>>>> b7a2c00c (Changelog updated)
 
 ### Updated
 
diff --git a/docs/home/COMPONENTS.md b/docs/home/COMPONENTS.md
index 23f77bb4c0..c255092445 100644
--- a/docs/home/COMPONENTS.md
+++ b/docs/home/COMPONENTS.md
@@ -14,7 +14,7 @@ Note that versions are default versions and can be changed in certain cases thro
 | Flannel                    | 0.14.0   | https://github.com/coreos/flannel/                    | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0)     |
 | Canal                      | 3.20.3   | https://github.com/projectcalico/calico               | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
 | Coredns                    | 1.8.4    | https://github.com/coredns/coredns                    | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
-| Kafka                      | 2.6.0    | https://github.com/apache/kafka                       | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
+| Kafka                      | 2.8.1    | https://github.com/apache/kafka                       | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
 | Zookeeper                  | 3.5.8    | https://github.com/apache/zookeeper                   | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
 | RabbitMQ                   | 3.8.9    | https://github.com/rabbitmq/rabbitmq-server           | [Mozilla Public License](https://www.mozilla.org/en-US/MPL/)      |
 | Docker CE                  | 20.10.8  | https://docs.docker.com/engine/release-notes/         | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |