diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da47b769c75faa7b8f8a29837730895560cbfb74..8d3b947d7922c30ca75ede04ed1c0f37433e8312 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,9 +86,10 @@ python tests:
       alias: rabbitmq
     - name: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
       alias: elastic
-      # fix issue with running elastic in gitlab ci runner:
-      # https://gitlab.com/gitlab-org/gitlab-ce/issues/42214
-      command: [ "bin/elasticsearch", "-Ediscovery.type=single-node" ]
+      command:
+        - bash
+        - "-c"
+        - ES_JAVA_OPTS="-Xms512m -Xmx512m" docker-entrypoint.sh elasticsearch -Ediscovery.type=single-node -Expack.security.enabled=false
     - name: mongo:5.0.6
       alias: mongo
   variables:
@@ -102,6 +103,8 @@ python tests:
     NOMAD_KEYCLOAK_PASSWORD: ${CI_KEYCLOAK_ADMIN_PASSWORD}
     NOMAD_NORMALIZE_SPRINGER_DB_PATH: /nomad/fairdi/db/data/springer.msg
   script:
+    - sleep 5
+    - curl http://elastic:9200/_cat/health
     - cd /app
     - ls /builds
     - python -m pytest --cov=nomad -sv tests
diff --git a/docs/oasis.md b/docs/oasis.md
index 76ffbfb8fdabf25efc6e6dbdd7c6332340f730ad..084d102f06faf46145bf4d31fc0341e95f6ccd33 100644
--- a/docs/oasis.md
+++ b/docs/oasis.md
@@ -103,6 +103,7 @@ services:
         image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
         container_name: nomad_oasis_elastic
         environment:
+            - ES_JAVA_OPTS=-Xms512m -Xmx512m
             - discovery.type=single-node
         volumes:
             - nomad_oasis_elastic:/usr/share/elasticsearch/data
diff --git a/ops/docker-compose/infrastructure/docker-compose.yml b/ops/docker-compose/infrastructure/docker-compose.yml
index 14b49d390e97652611c21c00493896e00df89630..c97c6df384c822ba64bf6c1281d1681c690be1f9 100644
--- a/ops/docker-compose/infrastructure/docker-compose.yml
+++ b/ops/docker-compose/infrastructure/docker-compose.yml
@@ -48,11 +48,13 @@ services:
         image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1
         container_name: nomad_elastic
         environment:
+            - ES_JAVA_OPTS=-Xms512m -Xmx512m
             - cluster.routing.allocation.disk.threshold_enabled=true
             - cluster.routing.allocation.disk.watermark.flood_stage=1gb
             - cluster.routing.allocation.disk.watermark.low=4gb
             - cluster.routing.allocation.disk.watermark.high=2gb
             - discovery.type=single-node
+            - xpack.security.enabled=false
         ports:
             - 9200:9200
         volumes: