diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 492036d..b3af196 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -65,8 +65,6 @@
       KAFKA_LISTENERS: PLAINTEXT://:9092
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'false'
-      KAFKA_CREATE_TOPICS: 'admin:1:1,users:1:1,projects:1:1,vim_account:1:1,wim_account:1:1,sdn:1:1,k8scluster:1:1,k8srepo:1:1,osmrepos:1:1,vnfd:1:1,nsd:1:1,nst:1:1,pdu:1:1,ns:1:1,nsi:1:1,alarm_request:1:1,alarm_response:1:1,pla:1:1'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     healthcheck:
diff --git a/installers/docker/osm_pods/kafka.yaml b/installers/docker/osm_pods/kafka.yaml
index 4b3b98b..61c752d 100644
--- a/installers/docker/osm_pods/kafka.yaml
+++ b/installers/docker/osm_pods/kafka.yaml
@@ -74,10 +74,6 @@
            value: "PLAINTEXT"
          - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
            value: "1"
-         - name: KAFKA_AUTO_CREATE_TOPICS_ENABLE
-           value: "false"
-         - name: KAFKA_CREATE_TOPICS
-           value: "admin:1:1,users:1:1,projects:1:1,vim_account:1:1,wim_account:1:1,sdn:1:1,k8scluster:1:1,k8srepo:1:1,osmrepos:1:1,vnfd:1:1,nsd:1:1,nst:1:1,pdu:1:1,ns:1:1,nsi:1:1,alarm_request:1:1,alarm_response:1:1"
         volumeMounts:
         - name: socket
           mountPath: /var/run/docker.sock