diff --git a/src/js/terminal.js b/src/js/terminal.js
index 715860f0d..a5c736876 100644
--- a/src/js/terminal.js
+++ b/src/js/terminal.js
@@ -271,12 +271,34 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client
     $scope.terminalInject = function (addon, extra) {
         if (!$scope.terminalSocket) return;
 
-        var cmd;
-        if (addon === 'mysql') cmd = 'mysql --user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} --host=${MYSQL_HOST} ${MYSQL_DATABASE}';
-        else if (addon === 'postgresql') cmd = 'PGPASSWORD=${POSTGRESQL_PASSWORD} psql -h ${POSTGRESQL_HOST} -p ${POSTGRESQL_PORT} -U ${POSTGRESQL_USERNAME} -d ${POSTGRESQL_DATABASE}';
-        else if (addon === 'mongodb') cmd = 'mongo -u "${MONGODB_USERNAME}" -p "${MONGODB_PASSWORD}" ${MONGODB_HOST}:${MONGODB_PORT}/${MONGODB_DATABASE}';
-        else if (addon === 'redis') cmd = 'redis-cli -h "${REDIS_HOST}" -p "${REDIS_PORT}" -a "${REDIS_PASSWORD}"';
-        else if (addon === 'scheduler' && extra) cmd = extra.command;
+        var cmd, manifestVersion = $scope.selected.manifest.manifestVersion;
+        if (addon === 'mysql') {
+            if (manifestVersion === 1) {
+                cmd = 'mysql --user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} --host=${MYSQL_HOST} ${MYSQL_DATABASE}';
+            } else {
+                cmd = 'mysql --user=${CLOUDRON_MYSQL_USERNAME} --password=${CLOUDRON_MYSQL_PASSWORD} --host=${CLOUDRON_MYSQL_HOST} ${CLOUDRON_MYSQL_DATABASE}';
+            }
+        } else if (addon === 'postgresql') {
+            if (manifestVersion === 1) {
+                cmd = 'PGPASSWORD=${POSTGRESQL_PASSWORD} psql -h ${POSTGRESQL_HOST} -p ${POSTGRESQL_PORT} -U ${POSTGRESQL_USERNAME} -d ${POSTGRESQL_DATABASE}';
+            } else {
+                cmd = 'PGPASSWORD=${CLOUDRON_POSTGRESQL_PASSWORD} psql -h ${CLOUDRON_POSTGRESQL_HOST} -p ${CLOUDRON_POSTGRESQL_PORT} -U ${CLOUDRON_POSTGRESQL_USERNAME} -d ${CLOUDRON_POSTGRESQL_DATABASE}';
+            }
+        } else if (addon === 'mongodb') {
+            if (manifestVersion === 1) {
+                cmd = 'mongo -u "${MONGODB_USERNAME}" -p "${MONGODB_PASSWORD}" ${MONGODB_HOST}:${MONGODB_PORT}/${MONGODB_DATABASE}';
+            } else {
+                cmd = 'mongo -u "${CLOUDRON_MONGODB_USERNAME}" -p "${CLOUDRON_MONGODB_PASSWORD}" ${CLOUDRON_MONGODB_HOST}:${CLOUDRON_MONGODB_PORT}/${CLOUDRON_MONGODB_DATABASE}';
+            }
+        } else if (addon === 'redis') {
+            if (manifestVersion === 1) {
+                cmd = 'redis-cli -h "${REDIS_HOST}" -p "${REDIS_PORT}" -a "${REDIS_PASSWORD}"';
+            } else {
+                cmd = 'redis-cli -h "${CLOUDRON_REDIS_HOST}" -p "${CLOUDRON_REDIS_PORT}" -a "${CLOUDRON_REDIS_PASSWORD}"';
+            }
+        } else if (addon === 'scheduler' && extra) {
+            cmd = extra.command;
+        }
 
         if (!cmd) return;
 
@@ -361,7 +383,8 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client
                         type: 'app',
                         value: app.id,
                         name: app.fqdn + ' (' + app.manifest.title + ')',
-                        addons: app.manifest.addons
+                        addons: app.manifest.addons,
+                        manifest: app.manifest
                     };
 
                     // now mark the Client to be ready