diff --git a/docker-compose.elastic.base.yml b/docker-compose.elastic.base.yml
index 46224de..b592be4 100755
--- a/docker-compose.elastic.base.yml
+++ b/docker-compose.elastic.base.yml
@@ -1,9 +1,9 @@
 version: '3.6'
 
 services:
-  elasticsearch:
+  elastic:
     build:
-      context: ./dockerfiles/elasticsearch
+      context: ./dockerfiles/elastic
     restart: on-failure
     environment:
       - discovery.type=single-node
diff --git a/docker-compose.elastic.yml.example b/docker-compose.elastic.yml.example
index d549c59..9d978ff 100755
--- a/docker-compose.elastic.yml.example
+++ b/docker-compose.elastic.yml.example
@@ -1,22 +1,22 @@
 version: '3.6'
 
 services:
-  elasticsearch732:
+  elastic732:
     extends:
-      file: docker-compose.elasticsearch.base.yml
-      service: elasticsearch
+      file: docker-compose.elastic.base.yml
+      service: elastic
     build:
       dockerfile: elastic732.Dockerfile
     volumes:
-      - elastic732:/usr/share/elasticsearch/data
-  elasticsearch752:
+      - elastic732:/usr/share/elastic/data
+  elastic752:
     extends:
-      file: docker-compose.elasticsearch.base.yml
-      service: elasticsearch
+      file: docker-compose.elastic.base.yml
+      service: elastic
     build:
       dockerfile: elastic752.Dockerfile
     volumes:
-      - elastic752:/usr/share/elasticsearch/data
+      - elastic752:/usr/share/elastic/data
 
 volumes:
   elastic732:
diff --git a/dockerfiles/elasticsearch/elastic.base.Dockerfile b/dockerfiles/elastic/elastic.base.Dockerfile
similarity index 100%
rename from dockerfiles/elasticsearch/elastic.base.Dockerfile
rename to dockerfiles/elastic/elastic.base.Dockerfile
diff --git a/dockerfiles/elasticsearch/elastic732.Dockerfile b/dockerfiles/elastic/elastic732.Dockerfile
similarity index 52%
rename from dockerfiles/elasticsearch/elastic732.Dockerfile
rename to dockerfiles/elastic/elastic732.Dockerfile
index 2c930d5..3807c69 100644
--- a/dockerfiles/elasticsearch/elastic732.Dockerfile
+++ b/dockerfiles/elastic/elastic732.Dockerfile
@@ -1,4 +1,5 @@
 # syntax = edrevo/dockerfile-plus
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.3.2
 
-INCLUDE+ ./elastic.base.Dockerfile
+#INCLUDE+ ./elastic.base.Dockerfile
+RUN elasticsearch-plugin install analysis-icu
diff --git a/dockerfiles/elasticsearch/elastic752.Dockerfile b/dockerfiles/elastic/elastic752.Dockerfile
similarity index 52%
rename from dockerfiles/elasticsearch/elastic752.Dockerfile
rename to dockerfiles/elastic/elastic752.Dockerfile
index b01b520..064108c 100644
--- a/dockerfiles/elasticsearch/elastic752.Dockerfile
+++ b/dockerfiles/elastic/elastic752.Dockerfile
@@ -1,4 +1,5 @@
 # syntax = edrevo/dockerfile-plus
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.5.2
 
-INCLUDE+ ./elastic.base.Dockerfile
+#INCLUDE+ ./elastic.base.Dockerfile
+RUN elasticsearch-plugin install analysis-icu
diff --git a/dockerfiles/workspace/workspace73.Dockerfile b/dockerfiles/workspace/workspace73.Dockerfile
index 36a4c00..12d25d2 100644
--- a/dockerfiles/workspace/workspace73.Dockerfile
+++ b/dockerfiles/workspace/workspace73.Dockerfile
@@ -28,6 +28,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN pecl install -a redis
 
+RUN echo "extension=redis.so" > /etc/php/7.3/cli/conf.d/20-redis.ini
+
 ###########################################################################
 # S3 config
 ###########################################################################
diff --git a/dockerfiles/workspace/workspace74.Dockerfile b/dockerfiles/workspace/workspace74.Dockerfile
index 2def86b..fa3e84b 100644
--- a/dockerfiles/workspace/workspace74.Dockerfile
+++ b/dockerfiles/workspace/workspace74.Dockerfile
@@ -29,6 +29,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 #RUN pecl install igbinary && pecl install -a redis
 RUN pecl install -a redis
 
+RUN echo "extension=redis.so" > /etc/php/7.4/cli/conf.d/20-redis.ini
+
 ###########################################################################
 # S3 config
 ###########################################################################