diff --git a/23cfree/sql-23c-features/sql-23c-features.md b/23cfree/sql-23c-features/sql-23c-features.md
index 8daf9fe65..aea35b56b 100644
--- a/23cfree/sql-23c-features/sql-23c-features.md
+++ b/23cfree/sql-23c-features/sql-23c-features.md
@@ -33,6 +33,7 @@ This lab assumes you have:
 To dive into these features, we'll be using SQL*Plus - an interactive and batch query tool that is installed with every Oracle Database installation. It has a command-line user interface.
 
 1. Your terminal should still be open since ORDS needs to be running. If the terminal has been closed, please return to the previous lab to restart ORDS. From the same terminal, enter this line:
+    <if type="sql-features">
 
     ```
     sqlplus hol23c/[your_password_here]@localhost:1521/freepdb1
@@ -43,6 +44,19 @@ To dive into these features, we'll be using SQL*Plus - an interactive and batch
     sqlplus hol23c/Welcome123@localhost:1521/freepdb1
     </copy>
     ```
+    </if>
+    <if type="23c-install">
+
+    ```
+    sqlplus hol23c/[your_password_here]@localhost:1521/freepdb1
+    ```
+    We used the password Welcome123#, but change [your\_password\_here] to match yours.
+    ```
+    <copy>
+    sqlplus hol23c/Welcome123#@localhost:1521/freepdb1
+    </copy>
+    ```
+    </if>
 
 ## Task 2: FROM clause - now optional
 An interesting feature introduced in Oracle Database 23c is optionality of FROM clause in SELECT statements. Up to this version the FROM clause was obligatory.
@@ -470,4 +484,4 @@ You may now **proceed to the next lab**.
 ## Acknowledgements
 * **Author** - Ulrike Schwinn, Distinguished Data Management Expert; Hope Fisher, Program Manager
 * **Contributors** - Witold Swierzy, Data Management Expert; Stephane Duprat, Technical End Specialist
-* **Last Updated By/Date** - Hope Fisher, Aug 2023
\ No newline at end of file
+* **Last Updated By/Date** - Hope Fisher, Aug 2023
diff --git a/23cfree/workshops/desktop-install/manifest.json b/23cfree/workshops/desktop-install/manifest.json
index 80c522573..660676c8c 100644
--- a/23cfree/workshops/desktop-install/manifest.json
+++ b/23cfree/workshops/desktop-install/manifest.json
@@ -41,7 +41,8 @@
             "title": "Lab 5: 23c New Features",
             "description": "Setting up the various tools",
             "type": "livelabs",
-            "filename": "../../sql-23c-features/sql-23c-features.md"
+            "filename": "../../sql-23c-features/sql-23c-features.md",
+            "type": "23c-install"
         },
         {
           "title": "Need Help?",
diff --git a/23cfree/workshops/desktop-sql-domains/manifest.json b/23cfree/workshops/desktop-sql-domains/manifest.json
index 7a048226c..1a542c0fe 100644
--- a/23cfree/workshops/desktop-sql-domains/manifest.json
+++ b/23cfree/workshops/desktop-sql-domains/manifest.json
@@ -23,7 +23,8 @@
             "title": "Lab 2: Power Up with 23c SQL Features",
             "description": "Power up with new features in Oracle Database 23c",
             "type": "livelabs",
-            "filename": "../../sql-23c-features/sql-23c-features.md"
+            "filename": "../../sql-23c-features/sql-23c-features.md",
+            "type": "sql-features"
         },
         {
             "title": "Lab 3: Leverage SQL Domains",
diff --git a/23cfree/workshops/ocw23-sandbox-sql-domains/manifest.json b/23cfree/workshops/ocw23-sandbox-sql-domains/manifest.json
index bd3c6f8b3..b99b0d39a 100644
--- a/23cfree/workshops/ocw23-sandbox-sql-domains/manifest.json
+++ b/23cfree/workshops/ocw23-sandbox-sql-domains/manifest.json
@@ -9,7 +9,7 @@
             "filename": "../../introduction/sql-domains-intro.md"
         },
         {   "title": "Get Started",
-            "description": "Prerequisites for LiveLabs (Oracle-owned tenancies). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.", 
+            "description": "Prerequisites for LiveLabs (Oracle-owned tenancies). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
             "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
         },
         {
@@ -22,7 +22,8 @@
             "title": "Lab 2: Power Up with 23c SQL Features",
             "description": "Power up with new features in Oracle Database 23c",
             "type": "livelabs",
-            "filename": "../../sql-23c-features/sql-23c-features.md"
+            "filename": "../../sql-23c-features/sql-23c-features.md",
+            "type": "sql-features"
         },
         {
             "title": "Lab 3: Leverage SQL Domains",
@@ -40,4 +41,4 @@
             "filename": "https://oracle-livelabs.github.io/common/support/ocwsupportlab/ocwsupportlab.md"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/23cfree/workshops/sandbox-install/manifest.json b/23cfree/workshops/sandbox-install/manifest.json
index 607bdd4a6..d22abeaed 100644
--- a/23cfree/workshops/sandbox-install/manifest.json
+++ b/23cfree/workshops/sandbox-install/manifest.json
@@ -41,7 +41,8 @@
             "title": "Lab 5: 23c New Features",
             "description": "Setting up the various tools",
             "type": "livelabs",
-            "filename": "../../sql-23c-features/sql-23c-features.md"
+            "filename": "../../sql-23c-features/sql-23c-features.md",
+            "type": "23c-install"
         },
         {
           "title": "Need Help?",
diff --git a/23cfree/workshops/sandbox-sql-domains/manifest.json b/23cfree/workshops/sandbox-sql-domains/manifest.json
index 1311f007e..8e8a76ecd 100644
--- a/23cfree/workshops/sandbox-sql-domains/manifest.json
+++ b/23cfree/workshops/sandbox-sql-domains/manifest.json
@@ -9,7 +9,7 @@
             "filename": "../../introduction/sql-domains-intro.md"
         },
         {   "title": "Get Started",
-            "description": "Prerequisites for LiveLabs (Oracle-owned tenancies). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.", 
+            "description": "Prerequisites for LiveLabs (Oracle-owned tenancies). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
             "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
         },
         {
@@ -22,7 +22,8 @@
             "title": "Lab 2: Power Up with 23c SQL Features",
             "description": "Power up with new features in Oracle Database 23c",
             "type": "livelabs",
-            "filename": "../../sql-23c-features/sql-23c-features.md"
+            "filename": "../../sql-23c-features/sql-23c-features.md",
+            "type": "sql-features"
         },
         {
             "title": "Lab 3: Leverage SQL Domains",
@@ -36,4 +37,4 @@
             "filename":"https://oracle-livelabs.github.io/common/labs/need-help/need-help-livelabs.md"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/23cfree/workshops/tenancy-install/manifest.json b/23cfree/workshops/tenancy-install/manifest.json
index 7f5374f32..d78bcc824 100644
--- a/23cfree/workshops/tenancy-install/manifest.json
+++ b/23cfree/workshops/tenancy-install/manifest.json
@@ -57,7 +57,8 @@
             "title": "Lab 5: 23c New Features",
             "description": "Setting up the various tools",
             "type": "livelabs",
-            "filename": "../../sql-23c-features/sql-23c-features.md"
+            "filename": "../../sql-23c-features/sql-23c-features.md",
+            "type": "23c-install"
         },
         {
           "title": "Need Help?",