diff --git a/docs/how-to/oracle.md b/docs/how-to/oracle.md
index 08e84092..d328aff4 100644
--- a/docs/how-to/oracle.md
+++ b/docs/how-to/oracle.md
@@ -46,7 +46,7 @@ e.g. For Hive:
 ```
 HIVE:
   host: "{{ database_host }}"
-  port: "{{ database_type | default_database_port }}"
+  port: "{{ database_port | default_database_port }}"
   type: "{{ database_type }}"
   name: "{{ database_name }}"
   user: hive
@@ -65,14 +65,14 @@ clusters:
     databases:
       HIVE:
         host: "{{ database_host }}"
-        port: "{{ database_type | default_database_port }}"
+        port: "{{ database_port | default_database_port }}"
         type: "{{ database_type }}"
         name: "{{ database_name }}"
         user: hive
         password: "{{ database_default_password }}"
       OOZIE:
         host: "{{ database_host }}"
-        port: "{{ database_type | default_database_port }}"
+        port: "{{ database_port | default_database_port }}"
         type: "{{ database_type }}"
         name: "{{ database_name }}"
         user: oozie
@@ -104,7 +104,7 @@ mgmt:
   databases:
     REPORTSMANAGER:
       host: "{{ database_host }}"
-      port: "{{ database_type | default_database_port }}"
+      port: "{{ database_port | default_database_port }}"
       type: "{{ database_type }}"
       name: "{{ database_name }}"
       user: rman
diff --git a/roles/cloudera_manager/common/defaults/main.yml b/roles/cloudera_manager/common/defaults/main.yml
index 798636d8..c2afd83d 100644
--- a/roles/cloudera_manager/common/defaults/main.yml
+++ b/roles/cloudera_manager/common/defaults/main.yml
@@ -27,6 +27,6 @@ cloudera_manager_database_type: "{{ database_type }}"
 cloudera_manager_database_name: scm
 cloudera_manager_database_user: scm
 cloudera_manager_database_password: changeme
-cloudera_manager_database_port: "{{ database_type | cloudera.cluster.default_database_port }}"
+cloudera_manager_database_port: "{{ database_port | cloudera.cluster.default_database_port }}"
 cloudera_manager_agent_lib_directory: /var/lib/cloudera-scm-agent
 cloudera_manager_cmf_java_opts_default: "-Xmx4G -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp"
diff --git a/roles/deployment/definition/defaults/main.yml b/roles/deployment/definition/defaults/main.yml
index b2d6ffff..d8c859c3 100644
--- a/roles/deployment/definition/defaults/main.yml
+++ b/roles/deployment/definition/defaults/main.yml
@@ -31,84 +31,84 @@ local_temp_dir: '/tmp'
 database_defaults:
   ACTIVITYMONITOR:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: amon
     user: amon
     password: "{{ database_default_password }}"
   DAS:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: das
     user: das
     password: "{{ database_default_password }}"
   HIVE:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: metastore
     user: hive
     password: "{{ database_default_password }}"
   HUE:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: hue
     user: hue
     password: "{{ database_default_password }}"
   NAVIGATOR:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: nav
     user: nav
     password: "{{ database_default_password }}"
   NAVIGATORMETASERVER:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: navms
     user: navms
     password: "{{ database_default_password }}"
   OOZIE:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: oozie
     user: oozie
     password: "{{ database_default_password }}"
   RANGER:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: ranger
     user: rangeradmin
     password: "{{ database_default_password }}"
   REPORTSMANAGER:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: rman
     user: rman
     password: "{{ database_default_password }}"
   SCHEMAREGISTRY:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: schemaregistry
     user: schemaregistry
     password: "{{ database_default_password }}"
   STREAMS_MESSAGING_MANAGER:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: streamsmsgmgr
     user: streamsmsgmgr
     password: "{{ database_default_password }}"
   SENTRY:
     host: "{{ database_host }}"
-    port: "{{ database_type | cloudera.cluster.default_database_port }}"
+    port: "{{ database_port | cloudera.cluster.default_database_port }}"
     type: "{{ database_type }}"
     name: sentry
     user: sentry