diff --git a/mongodb-org/tasks/mongodb.yml b/mongodb-org/tasks/mongodb.yml
index 4de14d0a..65f18f61 100644
--- a/mongodb-org/tasks/mongodb.yml
+++ b/mongodb-org/tasks/mongodb.yml
@@ -39,11 +39,19 @@
   tags: [ 'mongodb', 'mongodb_client', 'mongodb_repo' ]
 
 - block:
-    - name: Install the mongodb configuration
+    - name: Install/Update the mongodb configuration
       template: src=mongod-{{ mongodb_version }}.conf.j2 dest=/etc/mongod.conf owner=root group=root mode=0444 backup=yes
-      when: mongodb_install_conf
+      when: mongodb_install_server or mongodb_install_conf or mongodb_update_conf
       notify: Restart mongodb
 
+  tags: [ 'mongodb', 'mongodb_update_conf' ]
+
+- block:
+#    - name: Install the mongodb configuration
+#      template: src=mongod-{{ mongodb_version }}.conf.j2 dest=/etc/mongod.conf owner=root group=root mode=0444 backup=yes
+#      when: mongodb_install_conf
+#      notify: Restart mongodb
+
     - name: We are upgrading, install the latest version of the mongodb packages
       apt: pkg={{ item }} state=latest update_cache=yes cache_valid_time=1800
       with_items: '{{ mongodb_server_pkgs }}'