diff --git a/microtx-xa-stock-broker-app/introduction/introduction.md b/microtx-xa-stock-broker-app/introduction/introduction.md
index db1d96533..9d37ada43 100644
--- a/microtx-xa-stock-broker-app/introduction/introduction.md
+++ b/microtx-xa-stock-broker-app/introduction/introduction.md
@@ -6,7 +6,7 @@ As organizations rush to adopt microservices architecture, they often run into p
In this workshop, you will learn how to use MicroTx to maintain data consistency across several microservices by deploying and running a Bank and Stock-Trading application. This application contains several microservices and it uses distributed, two-phase commit transaction (XA). It is very simple to use MicroTx. After installing MicroTx, you only need to integrate the MicroTx libraries with your application code to manage transactions. In this workshop, you will learn how you can integrate the MicroTx client libraries with the Bank and Stock-Trading application. During the transaction, each microservice also makes updates to a resource manager to track the change in the amount and stocks. When you run the Bank and Stock-Trading application, you will be able to see how MicroTx ensures consistency of transactions across the distributed microservices and their resource managers. You will also integrate MicroTx with the Kubernetes ecosystem by using tools, such as Kiali and Jaeger, to visualize the flow of requests between MicroTx and the microservices.
-### About the Bank and Stock-Trading application
+### About the Bank and Stock-Trading Application
The Bank and Stock-Trading application demonstrates how you can develop microservices that participate in a distributed transaction while using MicroTx to coordinate the requests. You can use the application to withdraw or deposit an amount, as well as buy and sell stocks. Since financial applications that move funds require strong global consistency, the application uses XA transaction protocol.
@@ -41,7 +41,7 @@ In this workshop, you will learn how to:
This lab assumes you have:
- An Oracle Cloud account
-- 4 OCPU and 24 GB memory available in your Oracle Cloud account to run the Bank and Stock-Trading application.
+- At least 4 OCPUs, 24 GB memory, and 128 GB of bootable storage volume is available in your Oracle Cloud Infrastructure tenancy to run the Bank and Stock-Trading application.
Let's begin! If you need to create an Oracle Cloud account, click **Get Started** in the **Contents** menu on the left. Otherwise, if you have an existing account, click **Lab 1**.
diff --git a/microtx-xa-stock-broker-app/setup-compute/images/main-config-compute.png b/microtx-xa-stock-broker-app/setup-compute/images/main-config-compute.png
index d67a4055a..b25bbb22b 100644
Binary files a/microtx-xa-stock-broker-app/setup-compute/images/main-config-compute.png and b/microtx-xa-stock-broker-app/setup-compute/images/main-config-compute.png differ
diff --git a/microtx-xa-stock-broker-app/setup-compute/setup-compute-novnc-ssh.md b/microtx-xa-stock-broker-app/setup-compute/setup-compute-novnc-ssh.md
index 84e04167e..afe56d6ea 100644
--- a/microtx-xa-stock-broker-app/setup-compute/setup-compute-novnc-ssh.md
+++ b/microtx-xa-stock-broker-app/setup-compute/setup-compute-novnc-ssh.md
@@ -19,6 +19,7 @@ For more information about Terraform and Resource Manager, please see the append
This lab assumes you have:
- An Oracle Cloud account
- SSH Keys (optional)
+- At least 4 OCPUs, 24 GB memory, and 128 GB of bootable storage volume is available in your Oracle Cloud Infrastructure tenancy to run the Bank and Stock-Trading application.
- You have completed:
- Lab: Prepare Setup
@@ -32,7 +33,7 @@ Your options are:
## Task 1A: Create Stack: Compute + Networking
1. Identify the ORM stack zip file downloaded in *Lab: Prepare Setup*
2. Log in to Oracle Cloud
-3. Open up the hamburger menu in the top left corner. Click **Developer Services**, and choose **Resource Manager > Stacks**. Choose the compartment in which you would like to install the stack. Click **Create Stack**.
+3. Open up the hamburger menu in the top left corner. Click **Developer Services**, and choose **Resource Manager > Stacks**. Choose the compartment in which you would like to install the stack. Click **Create Stack**.
@@ -72,16 +73,9 @@ Your options are:
Depending on the quota you have in your tenancy you can choose from standard Compute shapes or Flex shapes. Please visit the Appendix: Troubleshooting Tips for instructions on checking your quota
- - **Use Flexible Instance Shape with Adjustable OCPU Count?:** Keep the default as checked (unless you plan on using a fixed shape)
- - **Instance Shape:** Keep the default or select from the list of Flex shapes in the dropdown menu (e.g *VM.Standard.E4.Flex*).
- - **Instance OCPUS:** Enter 3 to provision an instance with 3 OCPUs.
-
- If don't have the required quota for Flex Shapes or you prefer to use fixed shapes, follow the instructions below. Otherwise, skip to the next step.
-
- - **Use Flexible Instance Shape with Adjustable OCPU Count?:** Unchecked
- - **Instance Shape:** Accept the default shown or select from the dropdown. e.g. VM.Standard2.2
-
- 
+ - **Use Flexible Instance Shape with Adjustable OCPU Count?:** Keep the default as checked.
+ - **Instance Shape:** Select VM.Standard.E4.Flex.
+ - **Instance OCPUS:** Enter 4 to provision an instance with 4 OCPUs. This provisions a VM with 4 OCPUs and 24GB memory.
7. For this section we will provision a new VCN with all the appropriate ingress and egress rules needed to run this workshop. If you already have a VCN, make sure it has all of the correct ingress and egress rules and skip to the next section.
- **Use Existing VCN?:** Accept the default by leaving this unchecked. This will create a **new VCN**.
@@ -151,16 +145,9 @@ If you just completed Task 1A, please proceed to Task 2. If you have an existin
Depending on the quota you have in your tenancy you can choose from standard Compute shapes or Flex shapes. Please visit the Appendix: Troubleshooting Tips for instructions on checking your quota
- - **Use Flexible Instance Shape with Adjustable OCPU Count?:** Keep the default as checked (unless you plan on using a fixed shape)
- - **Instance Shape:** Keep the default or select from the list of Flex shapes in the dropdown menu (e.g *VM.Standard.E4.Flex*).
- - **Instance OCPUS:** Accept the default shown. e.g. (**4**) will provision 4 OCPUs and 64GB of memory. You may also elect to reduce or increase the count by selecting from the dropdown. e.g. `[2-24]`. Please ensure you have the capacity available before increasing.
-
- If don't have the required quota for Flex Shapes or you prefer to use fixed shapes, follow the instructions below. Otherwise, skip to the next step.
-
- - **Use Flexible Instance Shape with Adjustable OCPU Count?:** Unchecked
- - **Instance Shape:** Accept the default shown or select from the dropdown. e.g. VM.StandardE2.2
-
- 
+ - **Use Flexible Instance Shape with Adjustable OCPU Count?:** Keep the default as checked.
+ - **Instance Shape:** Select VM.Standard.E4.Flex.
+ - **Instance OCPUS:** Enter 4 to provision an instance with 4 OCPUs. This provisions a VM with 4 OCPUs and 24GB memory.
7. For this section we will an existing VNC. Please make sure it has all of the correct ingress and egress rules otherwise go back to *Task 1A* and deploy with a self-contained VCN.
- **Use Existing VCN?:** Check to select.
diff --git a/tmm-run-sample-apps/env-setup/images/19c-remote-desktop.png b/tmm-run-sample-apps/env-setup/images/19c-remote-desktop.png
new file mode 100644
index 000000000..5d52ac851
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/19c-remote-desktop.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/app-info.png b/tmm-run-sample-apps/env-setup/images/app-info.png
new file mode 100644
index 000000000..9fc41b38b
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/app-info.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/apply-in-progress.png b/tmm-run-sample-apps/env-setup/images/apply-in-progress.png
new file mode 100644
index 000000000..7679374fa
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/apply-in-progress.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/apply-job-success.png b/tmm-run-sample-apps/env-setup/images/apply-job-success.png
new file mode 100644
index 000000000..313fca735
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/apply-job-success.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/applyresults.png b/tmm-run-sample-apps/env-setup/images/applyresults.png
new file mode 100644
index 000000000..033a0b96d
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/applyresults.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/applyresults2.png b/tmm-run-sample-apps/env-setup/images/applyresults2.png
new file mode 100644
index 000000000..b8e8dc2bb
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/applyresults2.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/auto-ssh.png b/tmm-run-sample-apps/env-setup/images/auto-ssh.png
new file mode 100644
index 000000000..3c003addf
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/auto-ssh.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/chmod.png b/tmm-run-sample-apps/env-setup/images/chmod.png
new file mode 100644
index 000000000..cd8134262
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/chmod.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/choose-ssh.png b/tmm-run-sample-apps/env-setup/images/choose-ssh.png
new file mode 100644
index 000000000..a2d946c13
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/choose-ssh.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/click-create.png b/tmm-run-sample-apps/env-setup/images/click-create.png
new file mode 100644
index 000000000..84e6ac91e
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/click-create.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/compute-fixed.png b/tmm-run-sample-apps/env-setup/images/compute-fixed.png
new file mode 100644
index 000000000..e3edb438d
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/compute-fixed.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/compute-flex.png b/tmm-run-sample-apps/env-setup/images/compute-flex.png
new file mode 100644
index 000000000..8de486df9
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/compute-flex.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/copy-private-key.png b/tmm-run-sample-apps/env-setup/images/copy-private-key.png
new file mode 100644
index 000000000..f85fe8366
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/copy-private-key.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/create-stack-novnc-ssh-10.png b/tmm-run-sample-apps/env-setup/images/create-stack-novnc-ssh-10.png
new file mode 100644
index 000000000..cd8134262
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/create-stack-novnc-ssh-10.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/create-stack-novnc-ssh-11.png b/tmm-run-sample-apps/env-setup/images/create-stack-novnc-ssh-11.png
new file mode 100644
index 000000000..660e104d3
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/create-stack-novnc-ssh-11.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/create-stack.png b/tmm-run-sample-apps/env-setup/images/create-stack.png
new file mode 100644
index 000000000..563d2610a
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/create-stack.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-cloudshell-ssh.png b/tmm-run-sample-apps/env-setup/images/em-cloudshell-ssh.png
new file mode 100644
index 000000000..31329af71
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-cloudshell-ssh.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-create-stack-1.png b/tmm-run-sample-apps/env-setup/images/em-create-stack-1.png
new file mode 100644
index 000000000..3c9c3a246
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-create-stack-1.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-create-stack.png b/tmm-run-sample-apps/env-setup/images/em-create-stack.png
new file mode 100644
index 000000000..3b98089fb
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-create-stack.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-mac-linux-ssh-login.png b/tmm-run-sample-apps/env-setup/images/em-mac-linux-ssh-login.png
new file mode 100644
index 000000000..7cd3b99f1
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-mac-linux-ssh-login.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-public-subnet.png b/tmm-run-sample-apps/env-setup/images/em-public-subnet.png
new file mode 100644
index 000000000..26ad6c0d0
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-public-subnet.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-review-create-stack-compute-only.png b/tmm-run-sample-apps/env-setup/images/em-review-create-stack-compute-only.png
new file mode 100644
index 000000000..9bc0591d2
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-review-create-stack-compute-only.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-review-create-stack.png b/tmm-run-sample-apps/env-setup/images/em-review-create-stack.png
new file mode 100644
index 000000000..0b021c558
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-review-create-stack.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-apply-1.png b/tmm-run-sample-apps/env-setup/images/em-stack-apply-1.png
new file mode 100644
index 000000000..ff881a261
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-apply-1.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-apply-2.png b/tmm-run-sample-apps/env-setup/images/em-stack-apply-2.png
new file mode 100644
index 000000000..27f18eb17
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-apply-2.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-0.png b/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-0.png
new file mode 100644
index 000000000..195a62dbe
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-0.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-1.png b/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-1.png
new file mode 100644
index 000000000..352e53050
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-1.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-2.png b/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-2.png
new file mode 100644
index 000000000..6c8be5c5e
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-2.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-3.png b/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-3.png
new file mode 100644
index 000000000..f6860f0ab
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-apply-results-3.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-config-existing-vcn.png b/tmm-run-sample-apps/env-setup/images/em-stack-config-existing-vcn.png
new file mode 100644
index 000000000..c9bda59a2
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-config-existing-vcn.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-config-flex.png b/tmm-run-sample-apps/env-setup/images/em-stack-config-flex.png
new file mode 100644
index 000000000..7aa08c265
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-config-flex.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-details-b.png b/tmm-run-sample-apps/env-setup/images/em-stack-details-b.png
new file mode 100644
index 000000000..cfe5e70e0
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-details-b.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-details-post-plan.png b/tmm-run-sample-apps/env-setup/images/em-stack-details-post-plan.png
new file mode 100644
index 000000000..8a91e4699
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-details-post-plan.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-details.png b/tmm-run-sample-apps/env-setup/images/em-stack-details.png
new file mode 100644
index 000000000..7de31a51b
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-details.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-plan-1.png b/tmm-run-sample-apps/env-setup/images/em-stack-plan-1.png
new file mode 100644
index 000000000..ee2b8bd8a
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-plan-1.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-plan-2.png b/tmm-run-sample-apps/env-setup/images/em-stack-plan-2.png
new file mode 100644
index 000000000..8d9311b48
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-plan-2.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-1.png b/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-1.png
new file mode 100644
index 000000000..d744188a8
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-1.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-2.png b/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-2.png
new file mode 100644
index 000000000..1c9c03418
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-2.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-3.png b/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-3.png
new file mode 100644
index 000000000..11a07de94
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-3.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-4.png b/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-4.png
new file mode 100644
index 000000000..391041920
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-stack-plan-results-4.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/em-use-existing-vcn.png b/tmm-run-sample-apps/env-setup/images/em-use-existing-vcn.png
new file mode 100644
index 000000000..90ddd9026
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/em-use-existing-vcn.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/error-ad-mismatch.png b/tmm-run-sample-apps/env-setup/images/error-ad-mismatch.png
new file mode 100644
index 000000000..35f8e474a
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/error-ad-mismatch.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/essbase-click-url.png b/tmm-run-sample-apps/env-setup/images/essbase-click-url.png
new file mode 100644
index 000000000..f6130ef2b
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/essbase-click-url.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/essbase-fixed-shape.png b/tmm-run-sample-apps/env-setup/images/essbase-fixed-shape.png
new file mode 100644
index 000000000..f42d29102
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/essbase-fixed-shape.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/essbase-main-config.png b/tmm-run-sample-apps/env-setup/images/essbase-main-config.png
new file mode 100644
index 000000000..8cc16f944
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/essbase-main-config.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/essbase-remote-desktop.png b/tmm-run-sample-apps/env-setup/images/essbase-remote-desktop.png
new file mode 100644
index 000000000..c0511afd2
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/essbase-remote-desktop.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/firefox-launch-1.png b/tmm-run-sample-apps/env-setup/images/firefox-launch-1.png
new file mode 100644
index 000000000..b3e25b316
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/firefox-launch-1.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/firefox-launch-2.png b/tmm-run-sample-apps/env-setup/images/firefox-launch-2.png
new file mode 100644
index 000000000..443cc1667
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/firefox-launch-2.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/fixed-shape.png b/tmm-run-sample-apps/env-setup/images/fixed-shape.png
new file mode 100644
index 000000000..858b8fd16
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/fixed-shape.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/flex-shape-error.png b/tmm-run-sample-apps/env-setup/images/flex-shape-error.png
new file mode 100644
index 000000000..a5d72e1b8
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/flex-shape-error.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/invalid-ssh-key.png b/tmm-run-sample-apps/env-setup/images/invalid-ssh-key.png
new file mode 100644
index 000000000..d4080a080
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/invalid-ssh-key.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/main-config-compute-vnc.png b/tmm-run-sample-apps/env-setup/images/main-config-compute-vnc.png
new file mode 100644
index 000000000..d83ed9d76
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/main-config-compute-vnc.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/main-config-compute.png b/tmm-run-sample-apps/env-setup/images/main-config-compute.png
new file mode 100644
index 000000000..b25bbb22b
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/main-config-compute.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/no-e3flex-in-tenant.png b/tmm-run-sample-apps/env-setup/images/no-e3flex-in-tenant.png
new file mode 100644
index 000000000..35e7f726f
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/no-e3flex-in-tenant.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/no-quota.png b/tmm-run-sample-apps/env-setup/images/no-quota.png
new file mode 100644
index 000000000..f95ea2140
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/no-quota.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/novnc-deceptive-site-error.png b/tmm-run-sample-apps/env-setup/images/novnc-deceptive-site-error.png
new file mode 100644
index 000000000..41f31f3f4
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/novnc-deceptive-site-error.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/novnc-fullscreen-1.png b/tmm-run-sample-apps/env-setup/images/novnc-fullscreen-1.png
new file mode 100644
index 000000000..25d0b99de
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/novnc-fullscreen-1.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/novnc-fullscreen-2.png b/tmm-run-sample-apps/env-setup/images/novnc-fullscreen-2.png
new file mode 100644
index 000000000..4d95ef9a9
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/novnc-fullscreen-2.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/novnc-fullscreen-3.png b/tmm-run-sample-apps/env-setup/images/novnc-fullscreen-3.png
new file mode 100644
index 000000000..e298e6c6d
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/novnc-fullscreen-3.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/novnc-landing.png b/tmm-run-sample-apps/env-setup/images/novnc-landing.png
new file mode 100644
index 000000000..05711efc8
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/novnc-landing.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/novnc-launch-get-started.png b/tmm-run-sample-apps/env-setup/images/novnc-launch-get-started.png
new file mode 100644
index 000000000..0b6716c49
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/novnc-launch-get-started.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/novnc-login-ssh.png b/tmm-run-sample-apps/env-setup/images/novnc-login-ssh.png
new file mode 100644
index 000000000..a56e64c60
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/novnc-login-ssh.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/novnc-login.png b/tmm-run-sample-apps/env-setup/images/novnc-login.png
new file mode 100644
index 000000000..4f2923f6a
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/novnc-login.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/paste-ssh.png b/tmm-run-sample-apps/env-setup/images/paste-ssh.png
new file mode 100644
index 000000000..58e1b158d
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/paste-ssh.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/putty-auth.png b/tmm-run-sample-apps/env-setup/images/putty-auth.png
new file mode 100644
index 000000000..1a7eb6cc3
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/putty-auth.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/putty-data.png b/tmm-run-sample-apps/env-setup/images/putty-data.png
new file mode 100644
index 000000000..05cf599ba
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/putty-data.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/putty-ppk.png b/tmm-run-sample-apps/env-setup/images/putty-ppk.png
new file mode 100644
index 000000000..9405eac04
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/putty-ppk.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/putty-session.png b/tmm-run-sample-apps/env-setup/images/putty-session.png
new file mode 100644
index 000000000..1fe39b85f
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/putty-session.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/run-apply.png b/tmm-run-sample-apps/env-setup/images/run-apply.png
new file mode 100644
index 000000000..c3f5b39ac
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/run-apply.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/select-zip.png b/tmm-run-sample-apps/env-setup/images/select-zip.png
new file mode 100644
index 000000000..91aa34abe
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/select-zip.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/ssh-first-time.png b/tmm-run-sample-apps/env-setup/images/ssh-first-time.png
new file mode 100644
index 000000000..d190d6c0b
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/ssh-first-time.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/ssh-login.png b/tmm-run-sample-apps/env-setup/images/ssh-login.png
new file mode 100644
index 000000000..660e104d3
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/ssh-login.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/standardshape-2.png b/tmm-run-sample-apps/env-setup/images/standardshape-2.png
new file mode 100644
index 000000000..a63ef3072
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/standardshape-2.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/standardshape.png b/tmm-run-sample-apps/env-setup/images/standardshape.png
new file mode 100644
index 000000000..a6096e4b5
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/standardshape.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/terraformactions.png b/tmm-run-sample-apps/env-setup/images/terraformactions.png
new file mode 100644
index 000000000..1f6a6b6f6
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/terraformactions.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/use-exisiting-vcn.png b/tmm-run-sample-apps/env-setup/images/use-exisiting-vcn.png
new file mode 100644
index 000000000..36389cca6
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/use-exisiting-vcn.png differ
diff --git a/tmm-run-sample-apps/env-setup/images/zip-file.png b/tmm-run-sample-apps/env-setup/images/zip-file.png
new file mode 100644
index 000000000..640f75214
Binary files /dev/null and b/tmm-run-sample-apps/env-setup/images/zip-file.png differ
diff --git a/tmm-run-sample-apps/env-setup/setup-compute-novnc-ssh.md b/tmm-run-sample-apps/env-setup/setup-compute-novnc-ssh.md
new file mode 100644
index 000000000..9cbdf057f
--- /dev/null
+++ b/tmm-run-sample-apps/env-setup/setup-compute-novnc-ssh.md
@@ -0,0 +1,322 @@
+# Set up compute instance
+
+## Introduction
+This lab will show you how to set up a Resource Manager stack that will generate the Oracle Cloud objects needed to run your workshop.
+
+Estimated Time: 15 minutes
+
+Watch the video below for a walk-through of the Environment Setup lab.
+[Lab walk-through](videohub:1_icfgp61i)
+
+### About Terraform and Oracle Cloud Resource Manager
+For more information about Terraform and Resource Manager, please see the appendix below.
+
+### Objectives
+- Create Compute + Networking using Resource Manager Stack
+- Connect to compute instance
+
+### Prerequisites
+This lab assumes you have:
+- An Oracle Cloud account
+- SSH Keys (optional)
+- At least 4 OCPUs, 24 GB memory, and 128 GB of bootable storage volume is available in your Oracle Cloud Infrastructure tenancy
+- You have completed:
+ - Lab: Prepare Setup
+
+## Task 1: Create Stack: Choose a Path
+Proceed to deploy your workshop environment using Oracle Resource Manager (ORM) stack
+
+Your options are:
+1. Task 1A: Create Stack: **Compute + Networking** *(recommended)*
+2. Task 1B: Create Stack: **Compute Only**
+
+## Task 1A: Create Stack: Compute + Networking
+1. Identify the ORM stack zip file downloaded in *Lab: Prepare Setup*
+2. Log in to Oracle Cloud
+3. Open up the hamburger menu in the top left corner. Click **Developer Services**, and choose **Resource Manager > Stacks**. Choose the compartment in which you would like to install the stack. Click **Create Stack**.
+
+ 
+
+ 
+
+4. Select **My Configuration**, choose the **.Zip file** button, click the **Browse** link, and select the zip file that you downloaded or drag-n-drop for the file explorer.
+
+ 
+
+5. Click **Next**.
+
+6. Enter or select the following:
+
+ 
+
+ - **Instance Count:** Accept the default, **1**, unless you intend to create more than one (e.g. for a team)
+ - **Select Availability Domain:** Select an availability domain from the dropdown list.
+ - **Need Remote Access via SSH?** In this step you have 3 options to select from:
+ - **Option (A)** - Keep Unchecked for Remote Desktop only Access - The Default
+ - **Option (B)** - Check *Need Remote Access via SSH?* and keep *Auto Generate SSH Key Pair* unchecked to enable remote access via SSH protocol, then provide the SSH public key(s).
+
+ - **SSH Public Key**: Select from the following two options
+ - *Paste SSH Keys*: Paste the plaintext key strings or
+ - *Choose SSH Key Files*: Drag-n-drop or browse and select valid public keys of *openssh* format from your computer
+
+ 
+
+ 
+
+ >**Notes:**
+ 1. This assumes that you already have an RSA-type SSH key pair available on the local system where you will be connecting from. If you don't and for more info on creating and using SSH keys for your specific platform and client, please refer to the guide [Generate SSH Keys](https://oracle-livelabs.github.io/common/labs/generate-ssh-key)
+ 2. If you used the Oracle Cloud Shell to create your key, make sure you paste the pub file in a notepad, and remove any hard returns. The file should be one line or you will not be able to login to your compute instance
+
+ - **Option (C)** - Check *Need Remote Access via SSH?* and *Auto Generate SSH Key Pair* to have the keys auto-generated for you during provisioning. If you select this option you will be provided with the private key post provisioning.
+
+ 
+
+ Depending on the quota you have in your tenancy you can choose from standard Compute shapes or Flex shapes. Please visit the Appendix: Troubleshooting Tips for instructions on checking your quota
+
+ - **Use Flexible Instance Shape with Adjustable OCPU Count?:** Keep the default as checked.
+ - **Instance Shape:** Select VM.Standard.E4.Flex.
+ - **Instance OCPUS:** Enter 4 to provision an instance with 4 OCPUs. This provisions a VM with 4 OCPUs and 24GB memory.
+
+7. For this section we will provision a new VCN with all the appropriate ingress and egress rules needed to run this workshop. If you already have a VCN, make sure it has all of the correct ingress and egress rules and skip to the next section.
+ - **Use Existing VCN?:** Accept the default by leaving this unchecked. This will create a **new VCN**.
+
+8. Click **Next**.
+9. Select **Run Apply** and click **Create**.
+
+ 
+
+10. Your stack has now been created and the *Apply* action triggered is running to deploy your environment!
+
+ 
+
+You may now proceed to Task 2 (skip Task 1B).
+
+## Task 1B: Create Stack: Compute Only
+If you just completed Task 1A, please proceed to Task 2. If you have an existing VCN and are comfortable updating VCN configurations, please ensure your VCN meets the minimum requirements. Refer to *Lab: Prepare Setup*.
+
+ >**Note:** We recommend letting our stack create the VCN to reduce the potential for errors.
+
+1. Identify the ORM stack zip file downloaded in *Lab: Prepare Setup*
+2. Log in to Oracle Cloud
+3. Open up the hamburger menu in the top left corner. Click **Developer Services**, and choose **Resource Manager > Stacks**. Choose the compartment in which you would like to install the stack. Click **Create Stack**.
+
+ 
+
+ 
+
+4. Select **My Configuration**, choose the **.Zip file** button, click the **Browse** link, and select the zip file that you downloaded or drag-n-drop for the file explorer.
+
+ 
+
+ Enter the following information:
+ - **Name**: Enter a name or keep the prefilled default (*DO NOT ENTER ANY SPECIAL CHARACTERS HERE*, including periods, underscores, exclamation, etc, it will mess up the configuration and you will get an error during the apply process)
+ - **Description**: Same as above
+ - **Create in compartment**: Select the correct compartment if not already selected
+
+ >**Note:** If this is a newly provisioned tenant such as freetier with no user-created compartment, stop here and first create it before proceeding.
+
+5. Click **Next**.
+
+6. Enter or select the following:
+
+ 
+
+ - **Instance Count:** Accept the default, **1**, unless you intend to create more than one (e.g. for a team)
+ - **Select Availability Domain:** Select an availability domain from the dropdown list.
+ - **Need Remote Access via SSH?** In this step you have 3 options to select from:
+ - **Option (A)** - Keep Unchecked for Remote Desktop only Access - The Default
+ - **Option (B)** - Check *Need Remote Access via SSH?* and keep *Auto Generate SSH Key Pair* unchecked to enable remote access via SSH protocol, then provide the SSH public key(s).
+
+ - **SSH Public Key**: Select from the following two options
+ - *Paste SSH Keys*: Paste the plaintext key strings or
+ - *Choose SSH Key Files*: Drag-n-drop or browse and select valid public keys of *openssh* format from your computer
+
+ 
+
+ 
+
+ >**Notes:**
+ 1. This assumes that you already have an RSA-type SSH key pair available on the local system where you will be connecting from. If you don't and for more info on creating and using SSH keys for your specific platform and client, please refer to the guide [Generate SSH Keys](https://oracle-livelabs.github.io/common/labs/generate-ssh-key)
+ 2. If you used the Oracle Cloud Shell to create your key, make sure you paste the pub file in a notepad, and remove any hard returns. The file should be one line or you will not be able to login to your compute instance
+
+ - **Option (C)** - Check *Need Remote Access via SSH?* and *Auto Generate SSH Key Pair* to have the keys auto-generated for you during provisioning. If you select this option you will be provided with the private key post provisioning.
+
+ 
+
+ Depending on the quota you have in your tenancy you can choose from standard Compute shapes or Flex shapes. Please visit the Appendix: Troubleshooting Tips for instructions on checking your quota
+
+ - **Use Flexible Instance Shape with Adjustable OCPU Count?:** Keep the default as checked.
+ - **Instance Shape:** Select VM.Standard.E4.Flex.
+ - **Instance OCPUS:** Enter 4 to provision an instance with 4 OCPUs. This provisions a VM with 4 OCPUs and 24GB memory.
+
+7. For this section we will an existing VNC. Please make sure it has all of the correct ingress and egress rules otherwise go back to *Task 1A* and deploy with a self-contained VCN.
+ - **Use Existing VCN?:** Check to select.
+ - **Select Existing VCN:** Select existing VCN with the regional public subnet and required security list.
+
+ >**Note:** For an existing VCN Option to be used successfully, read *Appendix 3* at the bottom of this lab.
+
+ 
+
+9. Select **Run Apply** and click **Create**.
+ 
+
+9. Your stack is now created and the *Apply* action triggered is running to deploy your environment!
+
+ 
+
+## Task 2: Terraform Apply
+In the prior steps, we elected to trigger the *terraform apply action* on stack creation.
+
+1. Review the job output.
+
+ 
+
+2. Congratulations, your environment has been created! Click the **Application Information** tab to get additional information about what you have just done.
+
+3. Your public IP address(es), instance name(s), and remote desktop URL are displayed.
+
+## Task 3: Access the Graphical Remote Desktop
+For ease of execution of this workshop, your VM instance has been pre-configured with a remote graphical desktop accessible using any modern browser on your laptop or workstation. Proceed as detailed below to log in.
+
+1. Navigate to **Stack Details** -> **Application Information** tab, and click the **Remote Desktop** URL.
+
+ 
+
+ 
+
+ This should take you directly to your remote desktop in a single click.
+
+ 
+
+ >**Note:** While rare, you may see an error on the browser - “*Deceptive Site Ahead*” or similar depending on your browser type as shown below.
+
+ Public IP addresses used for LiveLabs provisioning come from a pool of reusable addresses and this error is because the address was previously used by a compute instance long terminated, but that wasn't properly secured, got bridged, and was flagged. You can safely ignore and proceed by clicking on *Details*, and finally, on *Visit this unsafe site*.
+
+ 
+
+You may now **proceed to the next lab**.
+
+## Appendix 1: Use Auto-generated SSH Keys to Connect to Your Instance via an SSH Terminal
+
+If you elected to auto-generate the SSH key pair at provisioning, proceed as indicated below.
+
+In this example, we will be illustrating a connection from a Unix-style terminal such as *Mobaxterm*, MacOS terminal, etc.. For *Putty* on Windows, please refer to the guide [Generate SSH Keys](https://oracle-livelabs.github.io/common/labs/generate-ssh-key) on how to convert the key to the required *.ppk* format.
+
+1. Click *Copy* to get the private key and paste it into a file on the system with an SSH client where you intend to initiate the connection. e.g. *mykey_rsa*.
+
+ 
+
+2. Restrict the permissions on the file to *0600*
+
+ ```text
+
+ chmod 600 mykey_rsa
+
+ ```
+
+ 
+
+3. Connect to your instance using the key.
+
+ ```text
+
+ ssh -i opc@
+
+ ```
+ 
+
+## Appendix 2: Terraform and Resource Manager
+Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. Configuration files describe to Terraform the components needed to run a single application or your entire datacenter. In this lab, a configuration file has been created for you to build a network and compute components. The compute component you will build creates an image out of Oracle's Cloud Marketplace. This image is running Oracle Linux 7.
+
+Resource Manager is an Oracle Cloud Infrastructure service that allows you to automate the process of provisioning your Oracle Cloud Infrastructure resources. Using Terraform, Resource Manager helps you install, configure, and manage resources through the "infrastructure-as-code" model. To learn more about OCI Resource Manager, watch the video below.
+
+[](youtube:udJdVCz5HYs)
+
+## Appendix 3: Troubleshooting Tips
+If you encountered any issues during the lab, follow the steps below to resolve them. If you are unable to resolve them, please go to the **Need Help** lab on the left menu to submit your issue to our support emailbox.
+- Availability Domain Mismatch
+- Limits Exceeded
+- Flex Shape Not Found
+- Instance shape selection grayed out
+
+### **Issue #1:** Availability Domain Mismatch
+
+
+#### Issue #1 Description
+When creating a stack and using an existing VCN, the availability domain and the subnet must match, otherwise the stack errors.
+
+#### Fix for Issue #1
+1. Click **Stack**-> **Edit Stack** -> **Configure Variables**.
+2. Scroll down to the network definition.
+3. Make sure the Availability Domain number matches the subnet number. E.g. If you choose AD-1, you must also choose subnet #1.
+4. Click **Next**
+5. Click **Save Changes**
+6. Click **Terraform Actions** -> **Apply**
+
+### **Issue #2:** Flex Shape Not Found
+
+
+#### Issue #2 Description
+When creating a stack, your ability to create an instance is based on the capacity you have available for your tenancy.
+
+#### Fix for Issue #2
+If you have other compute instances you are not using, you can go to those instances and delete them. If you are using them, follow the instructions to check your available usage and adjust your variables.
+1. Click the Hamburger menu on the top left corner, go to **Governance** -> **Limits, Quotas and Usage**
+2. Select **Compute**
+3. These labs use the following compute types. Check your limit, your usage and the amount you have available in each availability domain (click **Scope** to change Availability Domain)
+4. Look for *Cores for Standard.E2 based VM and BM instances*, *Cores for Standard.xx.Flex based VM and BM instances*, and *Cores for Optimized3 based VM and BM instances*
+5. Click the hamburger menu -> **Resource Manager** -> **Stacks**
+6. Click the stack you created previously
+7. Click **Edit Stack** -> **Configure Variables**.
+8. Scroll down to Options
+9. Change the **shape** based on the availability you have in your system
+10. Click **Next**
+11. Click **Save Changes**
+12. Click **Terraform Actions** -> **Apply**
+
+### **Issue #3:** Limits Exceeded
+
+
+
+#### Issue #3 Description
+When creating a stack, your ability to create an instance is based on the capacity you have available for your tenancy.
+
+*Please ensure that you have available cloud credits. Go to **Governance** -> **Limits, Quotas and Usage,** select **compute**, and ensure that you have **more than** the micro tier available. If you have only 2 micro computes, this workshop will NOT run.*
+
+#### Fix for Issue #3
+If you have other compute instances you are not using, you can go to those instances and delete them. If you are using them, follow the instructions to check your available usage and adjust your variables.
+
+1. Click the Hamburger menu, go to **Governance** -> **Limits, Quotas and Usage**
+2. Select **Compute**
+3. These labs use the following compute types. Check your limit, your usage and the amount you have available in each availability domain (click **Scope** to change Availability Domain)
+4. Look for *Cores for Standard.E2 based VM and BM instances*, *Cores for Standard.xx.Flex based VM and BM instances*, and *Cores for Optimized3 based VM and BM instances*
+5. Click the Hamburger menu -> **Resource Manager** -> **Stacks**
+6. Click the stack you created previously
+7. Click **Edit Stack** -> **Configure Variables**.
+8. Scroll down to **Options**
+9. Change the **shape** based on the availability you have in your system
+10. Click **Next**
+11. Click **Save Changes**
+12. Click **Terraform Actions** -> **Apply**
+
+### **Issue #4:** Instance Shape LOV Selection Grayed Out
+
+
+
+#### Issue #4 Description
+When creating a stack, select the option *"Use Flexible Instance Shape with Adjustable OCPU Count"*, but the *"Instance Shape"* LOV selection is grayed out, and the following error message is displayed:***"Specify a value that satisfies the following regular expression: ^VM\.(Standard\.E3\.Flex)$"***.
+
+This issue is an indication that your tenant is not currently configured to use flexible shapes (e3flex).
+
+#### Fix for Issue #4
+Modify your stack to use fixed shapes instead.
+
+1. Uncheck the option *"Use Flexible Instance Shape with Adjustable OCPU Count"* to use a fixed shape instead.
+
+
+You may now **proceed to the next lab**.
+
+## Acknowledgements
+* **Author** - Rene Fontcha, LiveLabs Platform Lead, NA Technology
+* **Contributors** - Marion Smith, Technical Program Manager, Arabella Yao, Database Product Manager
+* **Last Updated By/Date** - Arabella Yao, Jan 2023
\ No newline at end of file
diff --git a/tmm-run-sample-apps/introduction/introduction.md b/tmm-run-sample-apps/introduction/introduction.md
index 874e176dd..0d690f913 100644
--- a/tmm-run-sample-apps/introduction/introduction.md
+++ b/tmm-run-sample-apps/introduction/introduction.md
@@ -17,6 +17,7 @@ In this workshop, you will learn how to:
This lab assumes you have:
- An Oracle Cloud account
+- At least 4 OCPUs, 24 GB memory, and 128 GB of bootable storage volume is available in your Oracle Cloud Infrastructure tenancy.
Let's begin! If you need to create an Oracle Cloud account, click **Get Started** in the **Contents** menu on the left. Otherwise, if you have an existing account, click **Lab 1**.
diff --git a/tmm-run-sample-apps/workshops/tenancy/manifest.json b/tmm-run-sample-apps/workshops/tenancy/manifest.json
index 817c6ab24..511f3d0c0 100644
--- a/tmm-run-sample-apps/workshops/tenancy/manifest.json
+++ b/tmm-run-sample-apps/workshops/tenancy/manifest.json
@@ -20,7 +20,7 @@
{
"title": "Lab 2: Environment setup",
"description": "How to provision the workshop environment and connect to it",
- "filename": "https://oracle-livelabs.github.io/common/labs/setup-compute-generic/setup-compute-novnc-ssh.md"
+ "filename": "../../env-setup/setup-compute-novnc-ssh.md"
},
{
"title": "Lab 3: Run Travel agent app which uses LRA",