diff --git a/hadoop/CDH/tasks/cdm.yml b/hadoop/CDH/tasks/cdm.yml
new file mode 100644
index 0000000..c4f3463
--- /dev/null
+++ b/hadoop/CDH/tasks/cdm.yml
@@ -0,0 +1,34 @@
+---
+  - block: 
+      - name: apt key for the Cloudera Manager repository
+        apt_key: url=https://archive.cloudera.com/cm5/ubuntu/trusty/amd64/cm/archive.key state=present
+  
+      - name: Install the Cloudera CDH packages repository
+        apt_repository: repo='{{ cdh_packages_repo }}' update_cache=yes
+  
+      - name: Install the CDH Manager server
+        apt: pkg=cloudera-manager-server state=present update_cache=yes cache_valid_time=1800
+  
+      - name: Install the CDH Manager daemons
+        apt: pkg=cloudera-manager-daemons state=present update_cache=yes cache_valid_time=1800
+  
+      - name: Install the Cloudera Manager DB configuration
+        template: src=db.properties.j2 dest=/etc/cloudera-scm-server/db.properties mode=0640 owner=cloudera-scm group=cloudera-scm
+        tags: [ 'cdh', 'hadoop', 'cdh_m_conf' ]
+  
+      - name: Ensure that the cloudera manager daemon is running and enabled
+        service: name=cloudera-scm-server state=started enabled=yes
+  
+    when: cdh_manager_install
+    tags: [ 'cdh', 'hadoop' ]
+  
+  - block:
+      - name: Install the Postgresql client
+        apt: pkg=postgresql-client state=latest update_cache=yes cache_valid_time=1800
+  
+      - name: Download the jdbc driver
+        get_url: url=https://jdbc.postgresql.org/download/postgresql-{{ postgresql_jdbc_driver_version }}.jar dest=/srv/postgresql.jar
+  
+    when: cdh_manager_install
+    tags: [ 'cdh', 'hadoop', 'cdh_manager', 'cdh_pg' ]
+  
\ No newline at end of file
diff --git a/hadoop/CDH/tasks/main.yml b/hadoop/CDH/tasks/main.yml
index 0be91ca..d923d28 100644
--- a/hadoop/CDH/tasks/main.yml
+++ b/hadoop/CDH/tasks/main.yml
@@ -1,42 +1,6 @@
 ---
-- block: 
-    - name: apt key for the Cloudera Manager repository
-      apt_key: url=https://archive.cloudera.com/cm5/ubuntu/trusty/amd64/cm/archive.key state=present
-
-    - name: Install the Cloudera CDH packages repository
-      apt_repository: repo='{{ cdh_packages_repo }}' update_cache=yes
-
-    - name: Install the CDH Manager server
-      apt: pkg=cloudera-manager-server state=present update_cache=yes cache_valid_time=1800
-
-    - name: Install the CDH Manager daemons
-      apt: pkg=cloudera-manager-daemons state=present update_cache=yes cache_valid_time=1800
-
-    - name: Install the Cloudera Manager DB configuration
-      template: src=db.properties.j2 dest=/etc/cloudera-scm-server/db.properties mode=0640 owner=cloudera-scm group=cloudera-scm
-      tags: [ 'cdh', 'hadoop', 'cdh_m_conf' ]
-
-    - name: Ensure that the cloudera manager daemon is running and enabled
-      service: name=cloudera-scm-server state=started enabled=yes
-
+- import_tasks: cdm.yml
   when: cdh_manager_install
-  tags: [ 'cdh', 'hadoop' ]
-
-- block:
-    - name: Install the Postgresql client
-      apt: pkg=postgresql-client state=latest update_cache=yes cache_valid_time=1800
-
-    - name: Download the jdbc driver
-      get_url: url=https://jdbc.postgresql.org/download/postgresql-{{ postgresql_jdbc_driver_version }}.jar dest=/srv/postgresql.jar
-
-  when: cdh_manager_install
-  tags: [ 'cdh', 'hadoop', 'cdh_manager', 'cdh_pg' ]
-
-- block:
-    - name: Get the Oozie ext libraries needed to activate the web console
-      unarchive: remote_src=yes src={{ cdh_oozie_ext_libs_url }} dest=/var/lib/oozie owner=oozie group=oozie
-      args:
-        creates: /var/lib/oozie/ext2.2
-
+- import_tasks: oozie.yml
   when: cdh_oozie_server
-  tags: [ 'cdh', 'hadoop', 'cdh_manager', 'oozie' ]
+  
\ No newline at end of file
diff --git a/hadoop/CDH/tasks/oozie.yml b/hadoop/CDH/tasks/oozie.yml
new file mode 100644
index 0000000..08ef0b9
--- /dev/null
+++ b/hadoop/CDH/tasks/oozie.yml
@@ -0,0 +1,12 @@
+---
+- block:
+  - name: Get the Oozie external libraries needet to activate the web console
+    get_url: url={{ cdh_oozie_ext_libs_url }} dest=/srv/
+
+  - name: Unarchive the Oozie ext libraries needed to activate the web console
+    unarchive: remote_src=yes src=/srv/ext-2.2.zip dest=/var/lib/oozie owner=oozie group=oozie
+    args:
+      creates: /var/lib/oozie/ext2.2
+
+  when: cdh_oozie_server
+  tags: [ 'cdh', 'hadoop', 'cdh_manager', 'oozie' ]