diff --git a/devenv/docker/blocks/influxdb2/config.yaml b/devenv/docker/blocks/influxdb2/config.yaml
new file mode 100644
index 00000000000..15dd892ce27
--- /dev/null
+++ b/devenv/docker/blocks/influxdb2/config.yaml
@@ -0,0 +1 @@
+http-bind-address: :8086
\ No newline at end of file
diff --git a/devenv/docker/blocks/influxdb2/docker-compose.yaml b/devenv/docker/blocks/influxdb2/docker-compose.yaml
index 529242be528..3cd7379960a 100644
--- a/devenv/docker/blocks/influxdb2/docker-compose.yaml
+++ b/devenv/docker/blocks/influxdb2/docker-compose.yaml
@@ -1,18 +1,18 @@
   influxdb2:
-    image: quay.io/influxdb/influxdb:v2.0.3
+    image: influxdb:2.0.4
     container_name: influxdb2
     ports:
       - '8087:8086'
     environment:
-      INFLUXDB_REPORTING_DISABLED: 'true'
+      INFLUXD_REPORTING_DISABLED: 'true'
     volumes:
-      - ./docker/blocks/influxdb2/influxdb.conf:/etc/influxdb/influxdb.conf
+      - ./docker/blocks/influxdb2/config.yaml:/etc/influxdb2/config.yaml
 
   # Use the influx cli to set up an influxdb instance.
   influxdb2_cli:
     links:
       - influxdb2
-    image: quay.io/influxdb/influxdb:v2.0.3
+    image: influxdb:2.0.4
     # The following long command does 2 things:
     #   1. It initializes the bucket
     #   2. Maps bucket to database to enable backward-compatible access (influxql queries)
diff --git a/devenv/docker/blocks/influxdb2/influxdb.conf b/devenv/docker/blocks/influxdb2/influxdb.conf
deleted file mode 100644
index 120739dd896..00000000000
--- a/devenv/docker/blocks/influxdb2/influxdb.conf
+++ /dev/null
@@ -1,93 +0,0 @@
-reporting-disabled = false
-
-[meta]
-  # Where the metadata/raft database is stored
-  dir = "/var/lib/influxdb/meta"
-
-  retention-autocreate = true
-
-  # If log messages are printed for the meta service
-  logging-enabled = true
-  pprof-enabled = false
-
-  # The default duration for leases.
-  lease-duration = "1m0s"
-
-[data]
-  # Controls if this node holds time series data shards in the cluster
-  enabled = true
-
-  dir = "/var/lib/influxdb/data"
-
-  # These are the WAL settings for the storage engine >= 0.9.3
-  wal-dir = "/var/lib/influxdb/wal"
-  wal-logging-enabled = true
-
-
-[coordinator]
-  write-timeout = "10s"
-  max-concurrent-queries = 0
-  query-timeout = "0"
-  log-queries-after = "0"
-  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 # Whether to record statistics internally.
-  store-database = "_internal" # The destination database for recorded statistics
-  store-interval = "10s" # The interval at which to record statistics
-
-[admin]
-  enabled = true
-  bind-address = ":8083"
-  https-enabled = false
-  https-certificate = "/etc/ssl/influxdb.pem"
-
-[http]
-  enabled = true
-  bind-address = ":8086"
-  auth-enabled = true
-  log-enabled = true
-  write-tracing = false
-  pprof-enabled = false
-  https-enabled = false
-  https-certificate = "/etc/ssl/influxdb.pem"
-  ### Use a separate private key location.
-  # https-private-key = ""
-  max-row-limit = 10000
-  realm = "InfluxDB"
-
-  unix-socket-enabled = false # enable http service over unix domain socket
-  # bind-socket = "/var/run/influxdb.sock"
-  flux-enabled = true
-
-[subscriber]
-  enabled = true
-
-[[graphite]]
-  enabled = false
-
-[[collectd]]
-  enabled = false
-
-[[opentsdb]]
-  enabled = false
-
-[[udp]]
-  enabled = false
-
-[continuous_queries]
-  log-enabled = true
-  enabled = true
-  # run-interval = "1s" # interval for how often continuous queries will be checked if they need to run
-