diff --git a/.env b/.env
index cd43be5..093ebd4 100644
--- a/.env
+++ b/.env
@@ -39,6 +39,7 @@ PLACE_METRICS_ROUTE=monitor
 ELASTIC_HOST=elastic
 ELASTIC_PORT=9200
 ELASTIC_VERSION=7.10.2
+ELASTIC_OD_VERSION=1.13.2
 
 ETCD_HOST=etcd
 ETCD_PORT=2379
@@ -71,6 +72,7 @@ POSTGRES_PASSWORD=development
 # Logging variables
 
 ENABLE_KIBANA=false
+
 LOGSTASH_HOST=logstash
 LOGSTASH_PORT=12201
 KIBANA_PORT=443
diff --git a/docker-compose.yml b/docker-compose.yml
index 19f2e03..dc43e7f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.9"
 
 networks:
   placeos:
@@ -332,7 +332,7 @@ services:
   # Resources
 
   elastic:
-    image: blacktop/elasticsearch:${ELASTIC_VERSION:-7.10.2}
+    image: amazon/opendistro-for-elasticsearch:${ELASTIC_OD_VERSION:-1.13.2}
     restart: always
     container_name: elastic
     hostname: elastic
@@ -536,7 +536,7 @@ services:
     command: gelf://${LOGSTASH_HOST}:${LOGSTASH_PORT}
 
   kibana:
-    image: blacktop/kibana:${ELASTIC_VERSION:-7.10.2}
+    image: amazon/opendistro-for-elasticsearch-kibana:${ELASTIC_OD_VERSION:-1.13.2}
     profiles:
       - kibana
     restart: always