diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json
index da10ba52fa..89cf7bea72 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json
@@ -654,9 +654,9 @@
                                           "folders": {},
                                           "attributes": {
                                                 "MulticastAddress":    [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "MulticastAddress",    "wlst_path": "WP001", "default_value": null,          "derived_default": "${:true}", "wlst_type": "string",  "get_method": "GET", "restart_required": "true" } ],
-                                                "MulticastPort":       [ {"version": "[10,12.2.1.1)",  "wlst_mode": "both", "wlst_name": "MulticastPort",       "wlst_path": "WP001", "default_value": 6001,          "wlst_type": "integer", "restart_required": "true"} ,
+                                                "MulticastPort":       [ {"version": "[10,12.2.1.1)",  "wlst_mode": "both", "wlst_name": "MulticastPort",       "wlst_path": "WP001", "default_value": 6001,          "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true"} ,
                                                                          {"version": "[12.2.1.1,)",    "wlst_mode": "both", "wlst_name": "MulticastPort",       "wlst_path": "WP001", "default_value": "${0:6001}",   "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true"} ],
-                                                "MulticastTimeToLive": [ {"version": "[10,12.2.1.1)",  "wlst_mode": "both", "wlst_name": "MulticastTimeToLive", "wlst_path": "WP001", "default_value": 1,             "wlst_type": "integer", "restart_required": "true"} ,
+                                                "MulticastTimeToLive": [ {"version": "[10,12.2.1.1)",  "wlst_mode": "both", "wlst_name": "MulticastTimeToLive", "wlst_path": "WP001", "default_value": 1,             "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true"} ,
                                                                          {"version": "[12.2.1.1,)",    "wlst_mode": "both", "wlst_name": "MulticastTimeToLive", "wlst_path": "WP001", "default_value": "${0:1}",      "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true"} ],
                                                 "TemplateBean":        [ {"version": "[10,)",          "wlst_mode": "online", "wlst_name": "TemplateBean",      "wlst_path": "WP001", "default_value": null,          "wlst_type": "string", "access": "RO" } ]
                                           },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
index 7edbc0527f..7f57f0ed3a 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
@@ -1144,7 +1144,8 @@
                 "OutboundCertificateValidation":           [ {"version": "[10,)",           "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation",           "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string"            } ],
                 "OutboundPrivateKeyAlias":                 [ {"version": "[10.3.6,)",       "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias",                 "wlst_path": "WP001", "default_value": null,                   "wlst_type": "string",           "access": "RO" } ],
                 "OutboundPrivateKeyPassPhraseEncrypted":   [
-                    {"version": "[10,12.2.1.1)",     "wlst_mode": "both",    "wlst_name": "OutboundPrivateKeyPassPhrase",               "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "${:RO}"                                },
+                    {"version": "[10,12.2.1)",       "wlst_mode": "both",    "wlst_name": "OutboundPrivateKeyPassPhrase",               "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "${:RO}", "derived_default": "${:true}" },
+                    {"version": "[12.2.1,12.2.1.1)", "wlst_mode": "both",    "wlst_name": "OutboundPrivateKeyPassPhrase${Encrypted:}",  "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "${:RO}", "derived_default": "${:true}" },
                     {"version": "[12.2.1.1,)",       "wlst_mode": "both",    "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted",      "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "${:RO}", "derived_default": "${:true}" }
                 ],
                 "SSLRejectionLoggingEnabled":              [ {"version": "[10,)",            "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled",              "wlst_path": "WP001", "default_value": "true",                 "wlst_type": "boolean"           } ],