diff --git a/.ci/Dockerfile b/.ci/Dockerfile.client
similarity index 100%
rename from .ci/Dockerfile
rename to .ci/Dockerfile.client
diff --git a/.ci/Dockerfile.opendistro.no.security.plugin b/.ci/Dockerfile.server
similarity index 100%
rename from .ci/Dockerfile.opendistro.no.security.plugin
rename to .ci/Dockerfile.server
diff --git a/.ci/make.sh b/.ci/make.sh
index 93b261fb..c4463660 100755
--- a/.ci/make.sh
+++ b/.ci/make.sh
@@ -115,7 +115,7 @@ esac
 echo -e "\033[34;1mINFO: building $product container\033[0m"
 
 docker build \
-  --file $repo/.ci/Dockerfile \
+  --file $repo/.ci/Dockerfile.client \
   --tag ${product} \
   .
 
diff --git a/.ci/run-elasticsearch.sh b/.ci/run-elasticsearch.sh
index 7d2bb573..4d7cb3c7 100755
--- a/.ci/run-elasticsearch.sh
+++ b/.ci/run-elasticsearch.sh
@@ -93,10 +93,10 @@ END
   if [[ "$i" == "$((NUMBER_OF_NODES-1))" ]]; then local_detach=$DETACH; fi
 
 
-  echo -e "\033[34;1mINFO: building odfe-no-security-plugin container\033[0m"
+  echo -e "\033[34;1mINFO: building odfe container\033[0m"
   docker build \
-    --file=.ci/Dockerfile.opendistro.no.security.plugin \
-    --tag=odfe-no-security-plugin \
+    --file=.ci/Dockerfile.server \
+    --tag=odfe \
     .
 
   echo -e "\033[34;1mINFO:\033[0m Starting container $node_name \033[0m"
@@ -116,7 +116,7 @@ END
     --health-retries=20 \
     --health-timeout=2s \
     --rm \
-    odfe-no-security-plugin;
+    odfe;
 
   set +x
   if wait_for_container "$es_node_name" "$network_name"; then
diff --git a/.ci/run-repository.sh b/.ci/run-repository.sh
index 969009ff..cd598e6a 100755
--- a/.ci/run-repository.sh
+++ b/.ci/run-repository.sh
@@ -24,7 +24,7 @@ echo -e "\033[34;1mINFO:\033[0m PYTHON_CONNECTION_CLASS ${PYTHON_CONNECTION_CLAS
 echo -e "\033[1m>>>>> Build [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
 
 docker build \
-       --file .ci/Dockerfile \
+       --file .ci/Dockerfile.client \
        --tag elastic/elasticsearch-py \
        --build-arg PYTHON_VERSION=${PYTHON_VERSION} \
        .