diff --git a/openshift/templates/nodejs-mongodb.json b/openshift/templates/nodejs-mongodb.json
index 8760b07..11d266a 100644
--- a/openshift/templates/nodejs-mongodb.json
+++ b/openshift/templates/nodejs-mongodb.json
@@ -97,6 +97,9 @@
           {
             "type": "ImageChange"
           },
+          {
+            "type": "ConfigChange"
+          },
           {
             "type": "GitHub",
             "github": {
@@ -228,6 +231,19 @@
           "type": "Recreate"
         },
         "triggers": [
+          {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": false,
+              "containerNames": [
+                "mongodb"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "name": "mongodb:2.6"
+              }
+            }
+          },
           {
             "type": "ConfigChange"
           }
@@ -247,7 +263,7 @@
             "containers": [
               {
                 "name": "mongodb",
-                "image": "${MONGODB_IMAGE}",
+                "image": "mongodb",
                 "ports": [
                   {
                     "containerPort": 27017
@@ -336,11 +352,6 @@
       "description": "Password for the database admin user",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}"
-    },
-    {
-      "name": "MONGODB_IMAGE",
-      "description": "Image to use for mongodb",
-      "value": "openshift/mongodb-24-centos7"
     }
   ]
 }
diff --git a/openshift/templates/nodejs.json b/openshift/templates/nodejs.json
index e047266..1e301c0 100644
--- a/openshift/templates/nodejs.json
+++ b/openshift/templates/nodejs.json
@@ -97,6 +97,9 @@
           {
             "type": "ImageChange"
           },
+          {
+            "type": "ConfigChange"
+          },
           {
             "type": "GitHub",
             "github": {