diff --git a/geoserver/geoserver/tasks/geoserver.yml b/geoserver/geoserver/tasks/geoserver.yml
index bb5c29bb..e264dbe9 100644
--- a/geoserver/geoserver/tasks/geoserver.yml
+++ b/geoserver/geoserver/tasks/geoserver.yml
@@ -1,5 +1,4 @@
 ---
-  
 - block:
     - name: Create the Geoserver download directory
       file: path={{ geoserver_download_directory }} state=directory
@@ -20,6 +19,12 @@
       with_items: '{{ tomcat_m_instances }}'
       notify: tomcat instances restart
 
+    - name: Remove the postgres jdbc driver when we want a JNDI profile
+      shell: rm -f {{ item.instance_path }}/webapps/{{ geoserver_app_name }}/WEB-INF/lib/postgresql*.jdbc*.jar
+      with_items: '{{ tomcat_m_instances }}'
+      when: tomcat_install_pg_jdbc
+      notify: tomcat instances restart
+
     - name: Download newer jar files when needed
       get_url: url={{ item.1.url }} dest={{ item.0.instance_path }}/webapps/{{ geoserver_app_name }}/WEB-INF/lib/{{ item.1.file }} owner={{ item.0.user }} group={{ item.0.user }} force=yes
       with_together:
diff --git a/geoserver/geoserver/tasks/main.yml b/geoserver/geoserver/tasks/main.yml
index 03b4756c..5ef128e9 100644
--- a/geoserver/geoserver/tasks/main.yml
+++ b/geoserver/geoserver/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 - include: geoserver.yml
-- include: geoserver-gcubeapp.yml
-  when: smartgears_node is defined and smartgears_node
+# - include: geoserver-gcubeapp.yml
+#   when: smartgears_node is defined and smartgears_node