diff --git a/README.md b/README.md
index c9fdddf..3f96deb 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ See [Lab0 prerequisites](/labs/lab0/prerequisites.md) for the Hardware/Software
Review the Github Repo content for the NGINX Basics Workshop 101. If you have taken this Workshop, and understand the content, you can successfully complete the Lab exercises in this NGINX One Console Workshop. It is HIGHLY recommended that you complete the 101 Workshop prior.
-It will take approximately 1 hour to complete the NGINX One Console Workshop.
+It will take approximately 2-3 hour to complete the NGINX One Console Workshop.
diff --git a/labs/lab0/media/almostthere.png b/labs/lab0/media/almostthere.png
index 094a92d..ce08a7d 100644
Binary files a/labs/lab0/media/almostthere.png and b/labs/lab0/media/almostthere.png differ
diff --git a/labs/lab0/media/apache_guacamole.png b/labs/lab0/media/apache_guacamole.png
new file mode 100644
index 0000000..65c8b29
Binary files /dev/null and b/labs/lab0/media/apache_guacamole.png differ
diff --git a/labs/lab0/media/guacamole_login.png b/labs/lab0/media/guacamole_login.png
new file mode 100644
index 0000000..acd2deb
Binary files /dev/null and b/labs/lab0/media/guacamole_login.png differ
diff --git a/labs/lab0/media/joinbutton.png b/labs/lab0/media/joinbutton.png
index c13862b..96c4b58 100644
Binary files a/labs/lab0/media/joinbutton.png and b/labs/lab0/media/joinbutton.png differ
diff --git a/labs/lab0/media/launchrdp.png b/labs/lab0/media/launchrdp.png
index 2bc23b2..cf59031 100644
Binary files a/labs/lab0/media/launchrdp.png and b/labs/lab0/media/launchrdp.png differ
diff --git a/labs/lab0/media/rdp.png b/labs/lab0/media/rdp.png
new file mode 100644
index 0000000..fa44d88
Binary files /dev/null and b/labs/lab0/media/rdp.png differ
diff --git a/labs/lab0/media/rdp_desktop.png b/labs/lab0/media/rdp_desktop.png
new file mode 100644
index 0000000..bd00df9
Binary files /dev/null and b/labs/lab0/media/rdp_desktop.png differ
diff --git a/labs/lab0/media/useruser.png b/labs/lab0/media/useruser.png
index 20f89b2..104f143 100644
Binary files a/labs/lab0/media/useruser.png and b/labs/lab0/media/useruser.png differ
diff --git a/labs/lab0/media/waitforboot.png b/labs/lab0/media/waitforboot.png
index 27da273..d5986ef 100644
Binary files a/labs/lab0/media/waitforboot.png and b/labs/lab0/media/waitforboot.png differ
diff --git a/labs/lab0/readme.md b/labs/lab0/readme.md
index d2bb37a..e7bc7d2 100644
--- a/labs/lab0/readme.md
+++ b/labs/lab0/readme.md
@@ -27,72 +27,102 @@ Look for an email from **`courses@notify.udf.f5.com`**. This will have instructi
## Step 1: Get yourself to UDF
- Navigate to [https://udf.f5.com/](https://udf.f5.com/) and select `Invited Users`
+
- If this is your first time using UDF, use the `Sign Up` link which would take your to F5 registration page.
- **NOTE:** this will *not be the password to the Ubuntu Desktop or other VMs in the class!*
+ >**NOTE:** this will *not be the password to the Ubuntu Desktop or other VMs in the class!*
+
- Once you have filled in your registration details, you should be receiving an `Account Activation` email as shown below
- 
+
+ 
- When you click on the `Activate Account` button within the activation email, you would be redirected to setup 2 factor authentication as shown below. Select your preferred authentication method.
- 
+
+ 
- Once you have set up 2 factor authentication successfully, you will see a `green` checkmark on your preferred method. Click on `Finish`.
- 
+
+ 
- If you already have an account but you can't remember your password, simply reset your password by clicking on `Forgot Password?` link.
-
+
+ 
## Step 2: Start the course
- Once logged into UDF, click `Launch` (This will open a new tab.)
- 
+
+ 
- And then click on `Join`
- 
+
+ 
- Click the `DEPLOYMENT` tab at the top
-
-## Step 3: RDP to the Ubuntu Jumpbox
+ 
+
+## Step 3: RDP to the Jumphost
-- username: `ubuntu`
-- password: `Nginx123`
+- Wait for the Jumphost to finish booting. . .
-THIS REQUIRES AN RDP CLIENT! If you have a Mac *and* haven't downloaded an RDP client before, here is the first-party version:
+ 
-[Microsoft's RDP client on the Apple Apps Store](https://apps.apple.com/us/app/microsoft-remote-desktop/id1295203466?mt=12)
+- There are two ways to RDP to the Jumphost
-- Now you just have to wait for the Ubuntu Desktop to finish booting. . .
+ 
-
+ ### OPTION 1: Using **Apache Guacamole**
-- Make sure to select a small enough resolution to see the whole screen.
+ 
+
+ This workshop is enabled with Apache Guacamole, which is a clientless remote desktop gateway.
-
+ - To use Apache Guacamole, select `Guacamole` from the ACCESS drop down for the Jumphost.
-- Once you select the resolution, your browser will download an rdp file. Open this file to connect to Ubuntu Desktop.
+ - Click on "Allow" for the popup and then enter below credentials.
-- Accept the self-signed cert, the Ubuntu Desktop username and password will be `ubuntu` and `Nginx123`.
+ 
- (**NOTE:** This is *not* your UDF login username & password.)
+ - In the next window click on "OK" and then enter the login password (`Nginx123`) to log into the Jumphost.
- 
+ 
--------------
-> **If you can't connect to the Ubuntu Desktop, *remember to shut off your VPN*, or join a non-proxied network (sometimes a guest network in the office will work)**
--------------
+ ### OPTION 2: Using **xRDP**
+
+ 
+
+ THIS OPTION REQUIRES AN RDP CLIENT! If you have a Mac *and* haven't downloaded an RDP client before, here is the first-party version:
+
+ [Microsoft's RDP client on the Apple Apps Store](https://apps.apple.com/us/app/microsoft-remote-desktop/id1295203466?mt=12)
+
+ - To use your RDP client, select `xRDP` from the ACCESS drop down for the Jumphost. Make sure to select a small enough resolution to see the whole screen.
+
+ - Once you select the resolution, your browser will download an rdp file. Open this file to connect to the Jumphost.
+
+ - Accept the self-signed cert and then enter the login password (`Nginx123`) to log into the Jumphost.
+
+ (**NOTE:** This is *not* your UDF login password.)
+
+ 
+
+ > **If you can't connect to the Jumphost, *remember to shut off your VPN*, or join a non-proxied network (sometimes a guest network in the office will work)**
+
+ **For machines running Windows and attached to a domain, Windows will helpfully attempt to use your domain creds to log in, and you'll see:**
+
+ 
-**For machines running Windows and attached to a domain, Windows will helpfully attempt to use your domain creds to log in, and you'll see:**
+ **Click "More choices" to enter both a username and a password**
-
+ 
-### Click "More choices" to enter both a username and a password
+- Irrespective of which Option you choose to RDP to Jumphost, once logged in you should see an ubuntu desktop as below screenshot.
-
+ 
That wraps the pre-requisites.
diff --git a/labs/lab3/readme.md b/labs/lab3/readme.md
index 0462a2c..5cc72b2 100644
--- a/labs/lab3/readme.md
+++ b/labs/lab3/readme.md
@@ -350,12 +350,11 @@ If you would like to just run a few containers without Docker Compose, here are
curl https://docker-registry.nginx.com/v2/nginx/agent/tags/list | jq
```
-1. Find all the currently available `NGINX Plus` containers with Agent installed. Curl the `NGINX Private Registry` ( **NOTE:** you will need your `nginx-repo Certificate and Key` files to run this command):
+1. Find all the currently available `NGINX Plus` containers with Agent installed. Curl the `NGINX Private Registry` ( **NOTE:** you will use your `nginx-repo.jwt` license file to run this command):
```bash
- curl https://private-registry.nginx.com/v2/nginx-plus/agent/tags/list --key nginx-repo.key --cert nginx-repo.crt | jq
+ curl https://private-registry.nginx.com/v2/nginx-plus/agent/tags/list -u $JWT:none | jq
```
-
This ends Lab3.
diff --git a/labs/lab5/readme.md b/labs/lab5/readme.md
index 625ce78..7550b7c 100644
--- a/labs/lab5/readme.md
+++ b/labs/lab5/readme.md
@@ -160,7 +160,7 @@ Don't forget to remove your unused Instances from the NGINX One Console.
## Install NGINX Plus R32 on a VM
-Next you will create an NGINX instance that is pinned to version R32 on a virtual machine. This will show you an upgrade from R32 to the new R33 on a VM, a common NGINX upgrade task. From the Jumphost you can use the terminal to SSH to the VM's command line to do an install.
+Next you will create an NGINX instance that is pinned to version R32 on a virtual machine. This will show you an upgrade from R32 to the new R33 on a VM, a common NGINX upgrade task. From the Jumphost you can use the terminal to SSH to the VM's command line to do an install.
1. From the VS Studio Terminal window, run the following commands.
@@ -170,9 +170,6 @@ Next you will create an NGINX instance that is pinned to version R32 on a virtua
ssh nplus
cd ~/Documents
- sudo mkdir -p /etc/nginx/
- sudo cp license/license.jwt /etc/nginx/license.jwt
-
sudo mkdir -p /etc/ssl/nginx
sudo cp license/nginx-repo.* /etc/ssl/nginx/
```
@@ -461,7 +458,7 @@ Let's take the previous R32 install you just created and upgrade it. This time y
- Copy the value from the `~/Downloads/license/license.jwt` and enter it into this file. Click the `Next` button.
+ Copy the value from the `lab5/license.jwt` and enter it into this file. Click the `Next` button.
>**NOTE:** Make sure you do not add any extra spaces or characters to the license file or it would be considered invalid.