diff --git a/molecule/elasticsearch/molecule.yml b/molecule/elasticsearch/molecule.yml
index fbb06add..6860b0f3 100755
--- a/molecule/elasticsearch/molecule.yml
+++ b/molecule/elasticsearch/molecule.yml
@@ -3,45 +3,43 @@ dependency:
   name: galaxy
 driver:
   name: docker
-#lint:
-#  name: yamllint
 lint:
   name: yamllint
   options:
     config-data:
       ignore: .virtualenv
 platforms:
-        #  - name: bionic
-        #    image: solita/ubuntu-systemd:bionic
-        #    command: /sbin/init
-        #    ulimits:
-        #      - nofile:262144:262144
-        #    privileged: true
-        #    memory_reservation: 1024m
-        #  - name: xenial
-        #    image: solita/ubuntu-systemd:xenial
-        #    privileged: true
-        #    memory_reservation: 1024m
-        #    command: /sbin/init
-        #    ulimits:
-        #      - nofile:262144:262144
+# - name: bionic
+#   image: solita/ubuntu-systemd:bionic
+#   command: /sbin/init
+#   ulimits:
+#     - nofile:262144:262144
+#   privileged: true
+#   memory_reservation: 2048m
+# - name: xenial
+#   image: solita/ubuntu-systemd:xenial
+#   privileged: true
+#   memory_reservation: 2048m
+#   command: /sbin/init
+#   ulimits:
+#     - nofile:262144:262144
   - name: trusty
     image: ubuntu:trusty
-    memory_reservation: 1024m
+    memory_reservation: 2048m
     ulimits:
       - nofile:262144:262144
 #  - name: centos6
 #    image: centos:6
 #    privileged: true
-#    memory_reservation: 1024m
+#    memory_reservation: 2048m
+#    ulimits:
+#      - nofile:262144:262144
+#  - name: centos7
+#    image: milcom/centos7-systemd
+#    memory_reservation: 2048m
+#    privileged: true
 #    ulimits:
 #      - nofile:262144:262144
-        #  - name: centos7
-        #    image: milcom/centos7-systemd
-        #    memory_reservation: 1024m
-        #    privileged: true
-        #    ulimits:
-        #      - nofile:262144:262144
 provisioner:
   name: ansible
   playbooks:
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
index 17b968cc..642e2ee9 100755
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@@ -32,13 +32,19 @@
     - ansible_distribution == "Ubuntu"
     - ansible_distribution_major_version | int == 14
 
-- name: Set the default Java version
-  become: yes
-  shell: update-alternatives --config java
+#- name: Set the default Java version
+#  become: yes
+#  shell: update-alternatives --config java
+#  when:
+#    - ansible_distribution == "Ubuntu"
+#    - ansible_distribution_major_version | int == 14#
 
-- name: Set the default Javac version
-  become: yes
-  shell: update-alternatives --config javac
+#- name: Set the default Javac version
+#  become: yes
+#  shell: update-alternatives --config javac
+#  when:
+#    - ansible_distribution == "Ubuntu"
+#    - ansible_distribution_major_version | int == 14
 
 - name: Update and upgrade apt packages
   become: true
@@ -55,12 +61,14 @@
     url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
     state: present
 
+
 - name: Debian/Ubuntu | Install Elastic repo
   apt_repository:
     repo: 'deb https://artifacts.elastic.co/packages/7.x/apt stable main'
     state: present
     filename: 'elastic_repo'
     update_cache: true
+  changed_when: false
 
 - name: Debian/Ubuntu | Install Elasticsarch
   apt:
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
index 56a3157b..2d446798 100755
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
@@ -253,6 +253,5 @@
 - import_tasks: "RMRedHat.yml"
   when: ansible_os_family == "RedHat"
 
-
 - import_tasks: "RMDebian.yml"
   when: ansible_os_family == "Debian"