From 62e8e44e2d13ae7c710af7070343d548458200e2 Mon Sep 17 00:00:00 2001
From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com>
Date: Fri, 14 Jun 2024 13:17:34 +0200
Subject: [PATCH 1/2] Zwe start help clarification (#3865)

Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com>
---
 bin/commands/start/.help | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/commands/start/.help b/bin/commands/start/.help
index f3c2b870a9..b32f61f49f 100644
--- a/bin/commands/start/.help
+++ b/bin/commands/start/.help
@@ -8,7 +8,8 @@ zowe:
     security:
       stcs:
         zowe: ZWESLSTC
-  jobname: ZWE1SV
+  job:
+    name: ZWE1SV
 haInstances:
   [ha-instance]:
     sysname: ZLP1
@@ -21,3 +22,7 @@ haInstances:
 - `haInstances.[ha-instance].sysname` is the SYSNAME of the target HA instance.
   If you pass `--ha-instance` parameter, this is the SYSNAME the start command
   will be routed to.
+
+Note: `zwe start` is only identifying an already configured instance of Zowe.
+Any additional changes to the `zowe.yaml` config could possibly require
+either manual changes or running related `zwe` commands before issuing `zwe start`.

From a2a12b134999ebb490550ef3fc02bcfd3a0e760d Mon Sep 17 00:00:00 2001
From: "Jack (T.) Jia" <39711029+jackjia-ibm@users.noreply.github.com>
Date: Fri, 14 Jun 2024 07:33:36 -0400
Subject: [PATCH 2/2] pick latest base image versions (#2961)

Signed-off-by: Jack (T.) Jia <jack-tiefeng.jia@ibm.com>
Signed-off-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com>
Co-authored-by: Mark Ackert <35308966+MarkAckert@users.noreply.github.com>
---
 manifest.json.template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.json.template b/manifest.json.template
index abd6ba1afc..03ce61df96 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -462,17 +462,17 @@
     "base": {
         "registry": "zowe-docker-release.jfrog.io",
         "name": "ompzowe/base",
-        "tag" : "2.0-ubuntu"
+        "tag" : "2-ubuntu"
     },
     "base-jdk": {
         "registry": "zowe-docker-release.jfrog.io",
         "name": "ompzowe/base-jdk",
-        "tag" : "2.0-ubuntu"
+        "tag" : "2-ubuntu"
     },
     "base-node": {
         "registry": "zowe-docker-release.jfrog.io",
         "name": "ompzowe/base-node",
-        "tag" : "2.0-ubuntu"
+        "tag" : "2-ubuntu"
     }
   },
   "dependencyDecisions": {