diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml
index 177ebdfa2..d32c471fd 100644
--- a/salt/influxdb/defaults.yaml
+++ b/salt/influxdb/defaults.yaml
@@ -1,4 +1,158 @@
 influxdb:
+  config:
+    meta:
+      dir: '/var/lib/influxdb/meta'
+      retention-autocreate: true
+      logging-enabled: true
+    data:
+      dir: '/var/lib/influxdb/data'
+      wal-dir: /var/lib/influxdb/wal'
+      wal-fsync-delay: '0s'
+      index-version: 'inmem'
+      race-logging-enabled: false
+      query-log-enabled: true
+      validate-keys: false
+      cache-max-memory-size: '1g'
+      cache-snapshot-memory-size: '25m'
+      cache-snapshot-write-cold-duration: '10m'
+      compact-full-write-cold-duration: '4h'
+      max-concurrent-compactions: 0
+      compact-throughput: '48m'
+      compact-throughput-burst: '48m'
+      max-index-log-file-size: '1m'
+      max-series-per-database: 1000000
+      max-values-per-tag: 100000
+      tsm-use-madv-willneed: false
+    coordinator:
+      write-timeout: '10s'
+      max-concurrent-queries: 0
+      query-timeout: '0s'
+      log-queries-after: '0s'
+      max-select-point: 0
+      max-select-series: 0
+      max-select-buckets: 0
+    retention:
+      enabled: true
+      check-interval: '30m'
+    shard-precreation:
+      enabled: true
+      check-interval: '10m'
+      advance-period: '30m'
+    monitor:
+      store-enabled: true
+      store-database: '_internal'
+      store-interval: '10s'
+    http:
+      enabled: true
+      flux-enabled: true
+      bind-address: ':8086'
+      auth-enabled: false
+      realm: 'InfluxDB'
+      log-enabled: false
+      suppress-write-log: false
+      access-log-path: ''
+      access-log-status-filters: []
+      write-tracing: false
+      pprof-enabled: true
+      debug-pprof-enabled: false
+      https-enabled: true
+      https-certificate: '/etc/ssl/influxdb.crt'
+      https-private-key: '/etc/ssl/influxdb.key'
+      shared-secret: ''
+      max-row-limit: 0
+      max-connection-limit: 0
+      unix-socket-enabled: false
+      bind-socket: '/var/run/influxdb.sock'
+      max-body-size: 25000000
+      max-concurrent-write-limit: 0
+      max-enqueued-write-limit: 0
+      enqueued-write-timeout: 0
+    logging:
+      format: 'auto'
+      level: 'info'
+      suppress-logo: false
+    subscriber:
+      enabled: true
+      http-timeout: '30s'
+      insecure-skip-verify: false
+      ca-certs: ''
+      write-concurrency: 40
+      write-buffer-size: 1000
+    graphite:
+      enabled: false
+      database: 'graphite'
+      retention-policy: ''
+      bind-address: ':2003'
+      protocol: 'tcp'
+      consistency-level: 'one'
+      batch-size: 5000
+      batch-pending: 10
+      batch-timeout: '1s'
+      udp-read-buffer: 0
+      separator: '.'
+      tags: ''
+      templates: ''
+    colectd:
+      enabled: false
+      bind-address: ':25826'
+      database: 'collectd'
+      retention-policy: ''
+      typesdb: '/usr/local/share/collectd'
+      security-level: 'none'
+      auth-file: '/etc/collectd/auth_file'
+      batch-size: 5000
+      bath-pending: 10
+      read-buffer: 0
+      parse-multivalue-plugin: 'split'
+    opentsdb:
+      enabled: false
+      bind-address: ':4242'
+      database: 'opentsdb'
+      retention-policy: ''
+      consistency-level: 'one'
+      tls-enabled: false
+      certificate: '/etc/ssl/influxdb.pem'
+      log-point-errors: true
+      batch-size: 1000
+      batch-pending: 5
+      bath-timeout: '1s'
+    udp:
+      enabled: false
+      bind-address: ':8089'
+      database: 'udp'
+      retention-policy: ''
+      precision: ''
+      batch-size: 5000
+      batch-pending: 10
+      batch-timeout: '1s'
+      read-buffer: 0
+    continuous_queries:
+      enabled: true
+      log-enabled: true
+      query-stats-enabled: false
+      run-interval: '1s'
+    tls:
+      ciphers:
+        - TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+        - TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
+        - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+        - TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+        - TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+        - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+        - TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
+        - TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
+        - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+        - TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
+        - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+        - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
+        - TLS_RSA_WITH_AES_128_CBC_SHA
+        - TLS_RSA_WITH_AES_128_CBC_SHA256
+        - TLS_RSA_WITH_AES_128_GCM_SHA256
+        - TLS_RSA_WITH_AES_256_CBC_SHA
+        - TLS_RSA_WITH_AES_256_GCM_SHA384
+      min-version: 'tls1.2'
+      max-version: 'tls1.2'
+
   retention_policies:
     so_short_term:
       default: True
diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index 321ce76d6..ae2b98072 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -47,8 +47,6 @@ so-influxdb:
   docker_container.running:
     - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-influxdb:{{ GLOBALS.so_version }}
     - hostname: influxdb
-    - environment:
-      - INFLUXDB_HTTP_LOG_ENABLED=false
     - binds:
       - /opt/so/log/influxdb/:/log:rw
       - /opt/so/conf/influxdb/etc/influxdb.conf:/etc/influxdb/influxdb.conf:ro