diff --git a/10broker-config.yml b/10broker-config.yml
index 7d296bf3..b4249c87 100644
--- a/10broker-config.yml
+++ b/10broker-config.yml
@@ -25,23 +25,6 @@ data:
     }
 
   server.properties: |-
-    # Licensed to the Apache Software Foundation (ASF) under one or more
-    # contributor license agreements.  See the NOTICE file distributed with
-    # this work for additional information regarding copyright ownership.
-    # The ASF licenses this file to You under the Apache License, Version 2.0
-    # (the "License"); you may not use this file except in compliance with
-    # the License.  You may obtain a copy of the License at
-    #
-    #    http://www.apache.org/licenses/LICENSE-2.0
-    #
-    # Unless required by applicable law or agreed to in writing, software
-    # distributed under the License is distributed on an "AS IS" BASIS,
-    # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    # See the License for the specific language governing permissions and
-    # limitations under the License.
-
-    # see kafka.server.KafkaConfig for additional details and defaults
-
     ############################# Server Basics #############################
 
     # The id of the broker. This must be set to a unique integer for each broker.
@@ -52,6 +35,8 @@ data:
     # Switch to enable topic deletion or not, default value is false
     delete.topic.enable=true
 
+    auto.create.topics.enable=false
+
     ############################# Socket Server Settings #############################
 
     # The address the socket server listens on. It will get the value returned from
@@ -89,7 +74,7 @@ data:
     ############################# Log Basics #############################
 
     # A comma seperated list of directories under which to store log files
-    log.dirs=/tmp/kafka-logs
+    log.dirs=/var/lib/kafka/data/topics
 
     # The default number of log partitions per topic. More partitions allow greater
     # parallelism for consumption, but this will also result in more files across
@@ -132,10 +117,10 @@ data:
     # from the end of the log.
 
     # The minimum age of a log file to be eligible for deletion due to age
-    log.retention.hours=168
+    log.retention.hours=-1
 
-    # A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
-    # segments don't drop below log.retention.bytes. Functions independently of log.retention.hours.
+    # A size-based retention policy for logs. Segments are pruned from the log unless the remaining
+    # segments drop below log.retention.bytes. Functions independently of log.retention.hours.
     #log.retention.bytes=1073741824
 
     # The maximum size of a log segment file. When this size is reached a new log segment will be created.
@@ -152,7 +137,7 @@ data:
     # server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002".
     # You can also append an optional chroot string to the urls to specify the
     # root directory for all kafka znodes.
-    zookeeper.connect=localhost:2181
+    zookeeper.connect=zookeeper:2181
 
     # Timeout in ms for connecting to zookeeper
     zookeeper.connection.timeout.ms=6000
@@ -168,23 +153,6 @@ data:
     group.initial.rebalance.delay.ms=0
 
   log4j.properties: |-
-    # Licensed to the Apache Software Foundation (ASF) under one or more
-    # contributor license agreements.  See the NOTICE file distributed with
-    # this work for additional information regarding copyright ownership.
-    # The ASF licenses this file to You under the Apache License, Version 2.0
-    # (the "License"); you may not use this file except in compliance with
-    # the License.  You may obtain a copy of the License at
-    #
-    #    http://www.apache.org/licenses/LICENSE-2.0
-    #
-    # Unless required by applicable law or agreed to in writing, software
-    # distributed under the License is distributed on an "AS IS" BASIS,
-    # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    # See the License for the specific language governing permissions and
-    # limitations under the License.
-
-    # Unspecified loggers and loggers with additivity=true output to server.log and stdout
-    # Note that INFO only applies to unspecified loggers, the log level of the child logger is used otherwise
     log4j.rootLogger=INFO, stdout
 
     log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -256,6 +224,6 @@ data:
     log4j.logger.state.change.logger=TRACE, stateChangeAppender
     log4j.additivity.state.change.logger=false
 
-    # Change to DEBUG to enable audit log for the authorizer
-    log4j.logger.kafka.authorizer.logger=WARN, authorizerAppender
+    # Access denials are logged at INFO level, change to DEBUG to also log allowed accesses
+    log4j.logger.kafka.authorizer.logger=INFO, authorizerAppender
     log4j.additivity.kafka.authorizer.logger=false
diff --git a/50kafka.yml b/50kafka.yml
index 0889d658..30275d88 100644
--- a/50kafka.yml
+++ b/50kafka.yml
@@ -36,14 +36,6 @@ spec:
         command:
         - ./bin/kafka-server-start.sh
         - /etc/kafka/server.properties
-        - --override
-        -   zookeeper.connect=zookeeper:2181
-        - --override
-        -   log.retention.hours=-1
-        - --override
-        -   log.dirs=/var/lib/kafka/data/topics
-        - --override
-        -   auto.create.topics.enable=false
         resources:
           requests:
             cpu: 100m