diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml
index dba5fa57..d1f59750 100644
--- a/tasks/elasticsearch-Debian.yml
+++ b/tasks/elasticsearch-Debian.yml
@@ -13,6 +13,10 @@
   apt_repository: repo="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present
   when: es_use_repository
 
+- name: Debian - include versionlock
+  include: elasticsearch-Debian-version-lock.yml
+  when: es_version_lock
+
 - name: Debian - Ensure elasticsearch is installed
   apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present force={{force_install}} cache_valid_time=86400
   when: es_use_repository
diff --git a/tasks/elasticsearch-version-lock.yml b/tasks/elasticsearch-version-lock.yml
deleted file mode 100644
index 7189203c..00000000
--- a/tasks/elasticsearch-version-lock.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Trigger Debian section
-- name: Include Debian specific Elasticsearch
-  include: elasticsearch-Debian-version-lock.yml
-  when: ansible_os_family == 'Debian'
-
-# Trigger Redhat section
-- name: Include RedHat specific Elasticsearch
-  include: elasticsearch-RedHat-version-lock.yml
-  when: ansible_os_family == 'RedHat'