diff --git a/core/src/main/python/wlsdeploy/tool/validate/validator.py b/core/src/main/python/wlsdeploy/tool/validate/validator.py
index 9dceb798bf..1ed605a987 100644
--- a/core/src/main/python/wlsdeploy/tool/validate/validator.py
+++ b/core/src/main/python/wlsdeploy/tool/validate/validator.py
@@ -824,7 +824,7 @@ def __validate_single_path_in_archive(self, path, attribute_name, model_folder_p
                 if not archive_has_file:
                     log_method('WLSDPLY-05024', attribute_name, model_folder_path, path,
                                self._archive_file_name, class_name=_class_name, method_name=_method_name)
-            elif not self._model_context.is_remote():
+            elif not self._model_context.is_remote() and not self._model_context.skip_archive():
                 log_method('WLSDPLY-05025', attribute_name, model_folder_path, path,
                            class_name=_class_name, method_name=_method_name)
         else:
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 5cc7deda1e..72183bc6a1 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
@@ -1069,9 +1069,7 @@
                 "Notes":                                   [ {"version": "[10,)",           "wlst_mode": "both", "wlst_name": "Notes",                                   "wlst_path": "WP001", "default_value": null,                   "wlst_type": "string"            } ],
                 "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.3.6,12.2.1)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase",            "wlst_path": "WP001", "default_value": null,                   "wlst_type": "password",         "access": "RO", "get_method": "GET"},
-                                                             {"version": "[12.2.1]",        "wlst_mode": "offline", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted","wlst_path": "WP001", "default_value": null,                   "wlst_type": "password"          },
-                                                             {"version": "[12.2.1.1,)",     "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted",   "wlst_path": "WP001", "default_value": null,                   "wlst_type": "password",         "get_method": "GET", "access": "RO" } ],
+                "OutboundPrivateKeyPassPhraseEncrypted":   [  {"version": "[12.2.1.1,)",    "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted",   "wlst_path": "WP001", "default_value": null,                   "wlst_type": "password"          }],
                 "SSLRejectionLoggingEnabled":              [ {"version": "[10,)",           "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled",              "wlst_path": "WP001", "default_value": "true",                 "wlst_type": "boolean"           } ],
                 "ServerCertificateChainFileName":          [ {"version": "[10,)",           "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName",          "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string"            } ],
                 "ServerCertificateFileName":               [ {"version": "[10,)",           "wlst_mode": "both", "wlst_name": "ServerCertificateFileName",               "wlst_path": "WP001", "default_value": "server-cert.der",      "wlst_type": "string"            } ],
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
index 02d5052007..efcffaab50 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
@@ -1079,8 +1079,8 @@
                 "Notes":                                   [ {"version": "[12.1.2,)",         "wlst_mode": "both", "wlst_name": "Notes",                                   "wlst_path": "WP001", "default_value": null,                   "wlst_type": "string"   } ],
                 "OutboundCertificateValidation":           [ {"version": "[12.1.2,)",         "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation",           "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string"   } ],
                 "OutboundPrivateKeyAlias":                 [ {"version": "[12.1.2,)",         "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias",                 "wlst_path": "WP001", "default_value": null,                   "wlst_type": "string",     "access": "RO" } ],
-                "OutboundPrivateKeyPassPhrase":            [ {"version": "[12.1.2,12.1.3]",   "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase",            "wlst_path": "WP001", "default_value": null,                   "wlst_type": "password",   "get_method": "GET", "access": "RO" } ],
-                "OutboundPrivateKeyPassPhraseEncrypted":   [ {"version": "[12.1.2,)",         "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted",   "wlst_path": "WP001", "default_value": null,                   "wlst_type": "password",   "get_method": "GET", "access": "RO" } ],
+                "OutboundPrivateKeyPassPhrase":            [ {"version": "[12.1.2,)",         "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase",            "wlst_path": "WP001", "default_value": null,                   "wlst_type": "password",   "get_method": "GET"  } ],
+                "OutboundPrivateKeyPassPhraseEncrypted":   [ {"version": "[12.2.1.1,)",     "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted",   "wlst_path": "WP001", "default_value": null,                   "wlst_type": "password",   "get_method": "GET" } ],
                 "SSLRejectionLoggingEnabled":              [ {"version": "[12.1.2,)",         "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled",              "wlst_path": "WP001", "default_value": "true",                 "wlst_type": "boolean"  } ],
                 "ServerCertificateChainFileName":          [ {"version": "[12.1.2,)",         "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName",          "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string"   } ],
                 "ServerCertificateFileName":               [ {"version": "[12.1.2,)",         "wlst_mode": "both", "wlst_name": "ServerCertificateFileName",               "wlst_path": "WP001", "default_value": "server-cert.der",      "wlst_type": "string"   } ],