diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 3a34c32..0255b3b 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -17,9 +17,13 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build the Docker image elasticsearch
       run: docker build ./elasticsearch --tag docker.pkg.github.com/digdes/elastic-docker/$IMAGE_NAME_ELASTIC
+    - name: Build the Docker image opendistro elasticsearch
+      run: docker build ./opendistro-elasticsearch --tag docker.pkg.github.com/digdes/elastic-docker/$IMAGE_NAME_OPENDISTRO
     - name: Log into GitHub Container Registry
       run: echo ${{ secrets.GITHUB_TOKEN }} | docker login -u DigDes --password-stdin docker.pkg.github.com
-    - name: Push image to GitHub Container Registry
+    - name: Push elasticsearch image to GitHub Container Registry
       run: docker push docker.pkg.github.com/digdes/elastic-docker/$IMAGE_NAME_ELASTIC
+    - name: Push opendistro elasticsearch image to GitHub Container Registry
+      run: docker push docker.pkg.github.com/digdes/elastic-docker/$IMAGE_NAME_OPENDISTRO
       
       
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 051e813..6a92782 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,3 +1,4 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.6.0
 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch ingest-attachment
-RUN yum install wget -y && wget https://github.com/DigDes/elasticsearch-analysis-morphology/raw/master/analysis-morphology-7.6.0.zip -O /tmp/analysis-morphology-7.6.0.zip && /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch file:///tmp/analysis-morphology-7.6.0.zip
\ No newline at end of file
+RUN yum install wget -y && wget https://github.com/DigDes/elasticsearch-analysis-morphology/raw/master/analysis-morphology-7.6.0.zip -O /tmp/analysis-morphology-7.6.0.zip && \
+        /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch file:///tmp/analysis-morphology-7.6.0.zip && rm /tmp/analysis-morphology-7.6.0.zip -f
\ No newline at end of file
diff --git a/opendistro-elasticsearch/Dockerfile b/opendistro-elasticsearch/Dockerfile
index 6913372..9bd90b9 100644
--- a/opendistro-elasticsearch/Dockerfile
+++ b/opendistro-elasticsearch/Dockerfile
@@ -1,3 +1,4 @@
 FROM amazon/opendistro-for-elasticsearch:1.13.2
 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch ingest-attachment
-RUN yum install wget -y && wget https://github.com/DigDes/elasticsearch-analysis-morphology/raw/master/analysis-morphology-7.10.2.zip -O /tmp/analysis-morphology.zip && /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch file:///tmp/analysis-morphology.zip
\ No newline at end of file
+RUN yum install wget -y && wget https://github.com/DigDes/elasticsearch-analysis-morphology/raw/master/analysis-morphology-7.10.2.zip -O /tmp/analysis-morphology.zip && \ 
+        /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch file:///tmp/analysis-morphology.zip && rm /tmp/analysis-morphology.zip -f
\ No newline at end of file