diff --git a/my_deploy.sh b/my_deploy.sh
index b89df7481ebd17edf2b966eb818598d1a04a596f..45e0d1301b2807ae7393d45366f849c69285b909 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -181,3 +181,8 @@ export GRAF_EXT_PORT_HTTP="3000"
 # Set the namespace where Apache Kafka will be deployed.
 export KFK_NAMESPACE="kafka"
 
+# Set the port Apache Kafka server will be exposed to.
+export KFK_SERVER_PORT="9092"
+
+# Set the flag to YES for redeploying of Apache Kafka
+export KFK_REDEPLOY=""
diff --git a/src/common/tools/kafka/Variables.py b/src/common/tools/kafka/Variables.py
index 9abc32b3e10a71c6191f987c26459855381fe6b7..e3ee2016acc7bc2323733d6781a57c755272bde3 100644
--- a/src/common/tools/kafka/Variables.py
+++ b/src/common/tools/kafka/Variables.py
@@ -23,11 +23,11 @@ LOGGER = logging.getLogger(__name__)
 
 class KafkaConfig(Enum):
     KFK_SERVER_ADDRESS_TEMPLATE = 'kafka-service.{:s}.svc.cluster.local:{:s}'
-    KFK_NAMESPACE  = get_setting('KFK_NAMESPACE')
-    KFK_PORT       = get_setting('KFK_SERVER_PORT')
-    # SERVER_ADDRESS    = "127.0.0.1:9092"
+    KFK_NAMESPACE               = get_setting('KFK_NAMESPACE')
+    KFK_PORT                    = get_setting('KFK_SERVER_PORT')
+    # SERVER_ADDRESS              = "127.0.0.1:9092"
     SERVER_ADDRESS =  KFK_SERVER_ADDRESS_TEMPLATE.format(KFK_NAMESPACE, KFK_PORT)
-    ADMIN_CLIENT   =  AdminClient({'bootstrap.servers': SERVER_ADDRESS })
+    ADMIN_CLIENT                = AdminClient({'bootstrap.servers': SERVER_ADDRESS })
 
 class KafkaTopic(Enum):
     REQUEST  = 'topic_request'