diff --git a/database/advanced/key-vault-nek3.zip b/database/advanced/key-vault-nek3.zip
new file mode 100644
index 000000000..6248df415
Binary files /dev/null and b/database/advanced/key-vault-nek3.zip differ
diff --git a/database/advanced/key-vault/images/UI-key.png b/database/advanced/key-vault/images/UI-key.png
new file mode 100644
index 000000000..7320a3579
Binary files /dev/null and b/database/advanced/key-vault/images/UI-key.png differ
diff --git a/database/advanced/key-vault/images/download-key.png b/database/advanced/key-vault/images/download-key.png
new file mode 100644
index 000000000..133045d0e
Binary files /dev/null and b/database/advanced/key-vault/images/download-key.png differ
diff --git a/database/advanced/key-vault/images/find-key.png b/database/advanced/key-vault/images/find-key.png
new file mode 100644
index 000000000..c6d13f6a0
Binary files /dev/null and b/database/advanced/key-vault/images/find-key.png differ
diff --git a/database/advanced/key-vault/images/gen-new-key copy.png b/database/advanced/key-vault/images/gen-new-key copy.png
new file mode 100644
index 000000000..8a71266d3
Binary files /dev/null and b/database/advanced/key-vault/images/gen-new-key copy.png differ
diff --git a/database/advanced/key-vault/images/gen-new-key.png b/database/advanced/key-vault/images/gen-new-key.png
new file mode 100644
index 000000000..0a19fca97
Binary files /dev/null and b/database/advanced/key-vault/images/gen-new-key.png differ
diff --git a/database/advanced/key-vault/images/id-key.png b/database/advanced/key-vault/images/id-key.png
new file mode 100644
index 000000000..bf6f44fdd
Binary files /dev/null and b/database/advanced/key-vault/images/id-key.png differ
diff --git a/database/advanced/key-vault/key-vault.md b/database/advanced/key-vault/key-vault.md
index cf4fd3f53..0ad44c44e 100644
--- a/database/advanced/key-vault/key-vault.md
+++ b/database/advanced/key-vault/key-vault.md
@@ -3,7 +3,7 @@
## Introduction
This workshop introduces the various features and functionality of Oracle Key Vault (OKV). It gives the user an opportunity to learn how to configure this appliance to manage keys.
-*Estimated Lab Time:* 55 minutes
+*Estimated Lab Time:* 60 minutes
*Version tested in this lab:* Oracle OKV 21.7
@@ -566,7 +566,45 @@ Oracle provides deployment recommendations for deployments that have two or more
-->
-## Task 9: Reset the OKV Lab Config
+## Task 9: Generate new Non-extractable key
+
+This task will demonstrate how to create a non-extractable key, meaning a key that does not leave the Oracle Key Vault cluster. The key can be accessed by the approved endpoints but not stored by the endpoint client or the endpoint persistent cache.
+
+1. Generate a new master encryption key for the PDB using the following command:
+ ````
+ ./okv_online_pdb_rekey.sh pdb1
+ ````
+ ![Generate Key](./images/gen-new-key.png "Key Vault")
+Take note of the tag information so you can identify this key in future steps.
+2. Verify we have the new master encryption key using the following command:
+ ````
+ echo Oracle123 | okvutil list -a
+ ````
+3. Identify the MKID from the command in the previous step. Take note that the current extractable value is set to true, meaning it can be stored by the endpoint client software.
+ ![Identify Key](./images/id-key.png "Key Vault")
+4. As KVRESTADMIN, navigate to the Keys & Wallets tab, click and press . Find that key in the OKV UI , mark it so that the extractable value is false and click Save.
+ ![Show UI Key](./images/ui-key.png "Key Vault")
+5. Run the following command again to see that the key is now marked as extractable = false:
+ ````
+ echo Oracle123 | okvutil list -a
+ ````
+ ![Find Key](./images/find-key.png "Key Vault")
+
+6. Attempt to download the wallet keys with okvutil. You will see that the okvutil is able to create an ewallet.p12 file but that file cannot contain the non-extractable key.
+ ````
+ okvutil download -l . -t wallet
+ ````
+ Enter the following for the wallet password:
+ ````
+ Oracle123
+ ````
+ Enter the following for the Endpoint password:
+ ````
+ Oracle123
+ ````
+ ![Download Key](./images/download-key.png "Key Vault")
+
+## Task 10: Reset the OKV Lab Config
1. Drop the Endpoint and Wallet created in OKV during this lab
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/create-schemas-load-data.md b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/configure-the-autonomous-database-environment.md
similarity index 97%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/create-schemas-load-data.md
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/configure-the-autonomous-database-environment.md
index 902ae4974..f9b4a6e95 100644
--- a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/create-schemas-load-data.md
+++ b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/configure-the-autonomous-database-environment.md
@@ -100,7 +100,7 @@ This lab assumes you have:
![Toggle web access on](images/web-access.png)
-12. Open the **Database Actions** portal for `EMPLOYEESEARCH_PROD`.
+12. Open the **Database Actions** portal for `EMPLOYEESEARCH_PROD` by copying the URL and pasting in a new incognito window.
![Open db actions as emp](images/db-actions-emp.png)
@@ -120,4 +120,4 @@ You may now **proceed to the next lab.**
- **Authors** - Alpha Diallo & Ethan Shmargad, North America Specialists Hub
- **Creator** - Pedro Lopes, Database Security Product Manager
-- **Last Updated By/Date** - Alpha Diallo & Ethan Shmargad, February 2023
\ No newline at end of file
+- **Last Updated By/Date** - Alpha Diallo & Alexander John, February 2024
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/atp-password.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/atp-password.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/atp-password.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/atp-password.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/copy-connection-string.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/copy-connection-string.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/copy-connection-string.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/copy-connection-string.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/create-autonomous-database.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/create-autonomous-database.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/create-autonomous-database.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/create-autonomous-database.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/create-custom-image.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/create-custom-image.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/create-custom-image.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/create-custom-image.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/create-the-atp.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/create-the-atp.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/create-the-atp.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/create-the-atp.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/db-actions-emp.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/db-actions-emp.png
new file mode 100644
index 000000000..23c9296d8
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/db-actions-emp.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/db-actions.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/db-actions.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/db-actions.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/db-actions.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/db-login.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/db-login.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/db-login.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/db-login.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/db-name.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/db-name.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/db-name.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/db-name.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/edit-user.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/edit-user.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/edit-user.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/edit-user.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/folder-icon.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/folder-icon.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/folder-icon.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/folder-icon.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/load-app-data.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/load-app-data.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/load-app-data.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/load-app-data.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/myhrapp-db-name.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/myhrapp-db-name.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/myhrapp-db-name.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/myhrapp-db-name.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/name-database.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/name-database.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/name-database.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/name-database.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/navigate-custom-image.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/navigate-custom-image.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/navigate-custom-image.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/navigate-custom-image.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/navigate-instances.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/navigate-instances.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/navigate-instances.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/navigate-instances.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/open-cloud-shell.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/open-cloud-shell.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/open-cloud-shell.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/open-cloud-shell.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/open-file.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/open-file.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/open-file.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/open-file.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/return-to-dash.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/return-to-dash.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/return-to-dash.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/return-to-dash.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/run-script.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/run-script.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/run-script.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/run-script.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/save-connection-string.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/save-connection-string.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/save-connection-string.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/save-connection-string.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/secure-access.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/secure-access.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/secure-access.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/secure-access.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/select-db-users.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/select-db-users.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/select-db-users.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/select-db-users.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/select-import-image.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/select-import-image.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/select-import-image.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/select-import-image.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/select-the-atp-menu.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/select-the-atp-menu.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/select-the-atp-menu.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/select-the-atp-menu.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/sql-worksheet.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/sql-worksheet.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/sql-worksheet.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/sql-worksheet.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/ssh-into-instance.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/ssh-into-instance.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/ssh-into-instance.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/ssh-into-instance.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/start-glassfish.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/start-glassfish.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/start-glassfish.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/start-glassfish.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/test-connection.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/test-connection.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/test-connection.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/test-connection.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/update-connection-string.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/update-connection-string.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/update-connection-string.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/update-connection-string.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/web-access.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/web-access.png
similarity index 100%
rename from database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/web-access.png
rename to database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/configure-the-autonomous-database-environment/images/web-access.png
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/db-actions-emp.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/db-actions-emp.png
deleted file mode 100644
index 9facfba18..000000000
Binary files a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/create-schemas-load-data/images/db-actions-emp.png and /dev/null differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/Check.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/Check.png
new file mode 100644
index 000000000..61ad0b66b
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/Check.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/Delete.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/Delete.png
new file mode 100644
index 000000000..b10d6712b
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/Delete.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/Nav_to_users.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/Nav_to_users.png
new file mode 100644
index 000000000..53ffde496
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/Nav_to_users.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/delete_employee.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/delete_employee.png
new file mode 100644
index 000000000..73b5facb3
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/delete_employee.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/drop (1).png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/drop (1).png
new file mode 100644
index 000000000..ac7397bde
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/drop (1).png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/drop-aud-pol.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/drop-aud-pol.png
new file mode 100644
index 000000000..861ae86e5
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/drop-aud-pol.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/drop.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/drop.png
new file mode 100644
index 000000000..ac7397bde
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/drop.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/verify_audit.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/verify_audit.png
new file mode 100644
index 000000000..9766737b1
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/verify_audit.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/verify_redaction.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/verify_redaction.png
new file mode 100644
index 000000000..64ef3263b
Binary files /dev/null and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/images/verify_redaction.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/reset-your-environment.md b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/reset-your-environment.md
index 38a801a7c..aeb274c63 100644
--- a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/reset-your-environment.md
+++ b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/reset-your-environment/reset-your-environment.md
@@ -4,14 +4,17 @@
In this lab, we will show you how to teardown your Autonomous Database instance. This will reset your environment to as it was before.
-Estimated Time: 2 minutes
+Estimated Time: 4 minutes
### Objectives
In this lab, you will complete the following tasks:
-- Terminate the Autonomous Database instance.
-
+- Drop the Audit and Redaction Policy
+- Drop EMPLOYEESEARCH_PROD schema and objects
+- Verify the schema, the redaction policy, and the unified audit policy have been removed
+- Terminate your ADB Instance
+
### Prerequisites
This lab assumes you have:
@@ -20,23 +23,96 @@ This lab assumes you have:
*Warning: Terminating resources may take a few minutes*
-## Task 1: Terminate the Autonomous Database instance
+## Task 1: Drop Audit policy and then the Redaction policy.
+1. Since our Unified Audit policy has served its purpose, we can drop it as we do not need to audit every single SELECT statement. As **ADMIN**, run the following script:
+
+ ```
+
+ noaudit policy audit_hr_select;
+ drop AUDIT POLICY audit_hr_select;
+ /
+ ```
+
+ ![Drop Audit Policy](images/drop-aud-pol.png)
+
+2. Navigate back to the **SQL window** for `EMPLOYEESEARCH_PROD` and **drop the redaction policy**.
+
+ ```
+ BEGIN
+ dbms_redact.drop_policy (
+ object_schema => 'EMPLOYEESEARCH_PROD',
+ object_name => 'DEMO_HR_EMPLOYEES',
+ policy_name => 'redact_emp_info'
+ );
+ end;
+ /
+ ```
+ ![Drop](images/drop.png)
+
+## Task 2: Drop the EMPLOYEESEARCH_PROD schema and objects
+
+1. As **ADMIN**, navigate to the Database users
+
+ ![Database users](images/Nav_to_users.png)
+
+2. Click the 3 dots on **EMPLOYEESEARHC_PROD** and click **Delete**
+
+ ![Three_dots](images/Delete.png)
+
+3. Choose **Cascade** and **Drop REST Services**
+
+ ![Cascade_Drop](images/Check.png)
+
+4. Delete user
+
+## Task 3: Verify the schema, the Redaction Policy, and the Unified Audit Policy have been removed
+
+1. As **ADMIN** in SQL Worksheet, perform the following query to make sure the user has been deleted
+select * from dba_users where username = 'EMPLOYEESEARCH_PROD';
+
+ ```
+
+ select * from dba_users where username = 'EMPLOYEESEARCH_PROD';
+ /
+ ```
+ ![Delete Employee](images/delete_employee.png)
+
+2. As **ADMIN** in SQL Worksheet, verify the unified audit policy has been deleted.
+select * from AUDIT_UNIFIED_POLICIES where policy_name = 'AUDIT_HR_SELECT';
+
+ ```
+
+ select * from AUDIT_UNIFIED_POLICIES where policy_name = 'AUDIT_HR_SELECT';
+ /
+ ```
+ ![Verify Audit](images/verify_audit.png)
+
+3. As **ADMIN** in SQL Worksheet, verify the Oracle Data redaction policy has been deleted"
+select * from redaction_policies where policy_name = 'REDACT_EMP_INFO';
-1. Navigate back to your **Autonomous Database** instance page on OCI.
+ ```
+
+ select * from redaction_policies where policy_name = 'REDACT_EMP_INFO';
+ /
+ ```
+ ![Verify Redaction](images/verify_redaction.png)
+
+## Task 4: Terminate the Autonomous Database Instance
- ![ADB page](images/adb-page.png)
+1. Navigate back to your Autonomous Database instance page on OCI.
-2. At the top menu bar, under **More Actions**, select **Terminate**.
+ ![Database users](images/adb-page.png)
- ![More actions](images/more-actions.png)
+2. At the top menu bar, under More Actions, select Terminate.
-3. In the pop-up window, type in the name of your database, then select **Terminate Autonomous Database**.
+ ![More actions](images/more-actions.png)
- ![Terminate adb](images/terminate.png)
+3. In the pop-up window, type in the name of your database, then select Terminate Autonomous Database.
+ ![Terminate adb](images/terminate.png)
## Acknowledgements
- **Authors** - Alpha Diallo & Ethan Shmargad, North America Specialists Hub
- **Creator** - Pedro Lopes, Database Security Product Manager
-- **Last Updated By/Date** - Alpha Diallo & Ethan Shmargad, February 2023
\ No newline at end of file
+- **Last Updated By/Date** - Alpha Diallo & Alexander John, February 2024
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/images/email.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/images/email.png
index 9155d588d..79c86effb 100644
Binary files a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/images/email.png and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/images/email.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/images/salary.png b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/images/salary.png
index 07f85ef03..b9f9749a4 100644
Binary files a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/images/salary.png and b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/images/salary.png differ
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/use-redaction-anonymize-all-restcalls-and-queries.md b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/use-redaction-anonymize-all-restcalls-and-queries.md
index b5cf09c18..566ad13b0 100644
--- a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/use-redaction-anonymize-all-restcalls-and-queries.md
+++ b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-anonymize-all-restcalls-and-queries/use-redaction-anonymize-all-restcalls-and-queries.md
@@ -77,7 +77,7 @@ When ready, click the **Enable button** in the lower right of the slider.
This is how our data looks before any redaction policy is applied.
-3. Add a **redaction policy** to run last name with random chars.
+3. Add a **redaction policy** to run last name with random chars as **EMPLOYEESEARCH_PROD**.
```
begin
@@ -106,7 +106,6 @@ When ready, click the **Enable button** in the lower right of the slider.
action => dbms_redact.add_column,
function_type => DBMS_REDACT.REGEXP,
function_parameters => NULL,
- expression => '1=1',
regexp_pattern => DBMS_REDACT.RE_PATTERN_EMAIL_ADDRESS,
regexp_replace_string => DBMS_REDACT.RE_REDACT_EMAIL_NAME,
regexp_position => DBMS_REDACT.RE_BEGINNING,
@@ -149,8 +148,7 @@ When ready, click the **Enable button** in the lower right of the slider.
policy_name => 'redact_emp_info',
policy_description => 'Partially redacts the salary column',
function_type => DBMS_REDACT.PARTIAL,
- function_parameters => '9,1,2',
- expression => '1=1');
+ function_parameters => '9,1,2');
END;
/
```
@@ -172,4 +170,4 @@ Congratulations, You have successfully redacted REST calls using ORDS!
- **Authors** - Alpha Diallo & Ethan Shmargad, North America Specialists Hub
- **Creator** - Pedro Lopes, Database Security Product Manager
-- **Last Updated By/Date** - Alpha Diallo & Ethan Shmargad, February 2023
+- **Last Updated By/Date** - Alpha Diallo & Alexander John, February 2024
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-to-anonymize-only-restcalls/use-redaction-to-anonymize-only-restcalls.md b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-to-anonymize-only-restcalls/use-redaction-to-anonymize-only-restcalls.md
index 2e1b8da57..b9ccb0064 100644
--- a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-to-anonymize-only-restcalls/use-redaction-to-anonymize-only-restcalls.md
+++ b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/use-redaction-to-anonymize-only-restcalls/use-redaction-to-anonymize-only-restcalls.md
@@ -117,31 +117,9 @@ This lab assumes you have:
![Run Query Again](images/re-run-qry.png)
3. Also re-run the REST Call. The data should still be redacted.
![Run Query Again](./images/redacted-call.png)
-## Task 4: Drop Audit policy and then the Redaction policy.
-1. Since our Unified Audit policy has served its purpose, we can drop it as we do not need to audit every single SELECT statement. As `ADMIN`, run the following script:
- ```
- noaudit policy audit_hr_select;
- drop AUDIT POLICY audit_hr_select;
- ```
- ![Drop Audit Policy](images/drop-aud-pol.png)
-2. Navigate back to the **SQL window** for `EMPLOYEESEARCH_PROD` and **drop the redaction policy**.
-
- ```
- BEGIN
- dbms_redact.drop_policy (
- object_schema => 'EMPLOYEESEARCH_PROD',
- object_name => 'DEMO_HR_EMPLOYEES',
- policy_name => 'redact_emp_info'
- );
- end;
- /
- ```
- ![Drop](images/drop.png)
-
-You may now **proceed to the next lab.**
## Acknowledgements
- **Authors** - Alpha Diallo & Ethan Shmargad, North America Specialists Hub
- **Creator** - Pedro Lopes, Database Security Product Manager
-- **Last Updated By/Date** - Alpha Diallo & Ethan Shmargad, February 2023
+- **Last Updated By/Date** - Alpha Diallo & Alexander John, February 2024
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/workshops/desktop/manifest.json b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/workshops/desktop/manifest.json
index 77ca81ab4..ada9cbc2e 100644
--- a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/workshops/desktop/manifest.json
+++ b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/workshops/desktop/manifest.json
@@ -15,7 +15,7 @@
{
"title": "Lab 1: Configure the Autonomous Database environment",
"description": "",
- "filename": "../../create-schemas-load-data/create-schemas-load-data.md"
+ "filename": "../../configure-the-autonomous-database-environment/configure-the-autonomous-database-environment.md"
},
{
"title": "Lab 2: Use Redaction to anonymize all REST Get calls and queries",
diff --git a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/workshops/tenancy/manifest.json b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/workshops/tenancy/manifest.json
index 2595018c9..07a769933 100644
--- a/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/workshops/tenancy/manifest.json
+++ b/database/protect-sensitive-data-in-rest-get-calls-using-oracle-data-redaction/workshops/tenancy/manifest.json
@@ -15,7 +15,7 @@
{
"title": "Lab 1: Configure the Autonomous Database environment",
"description": "",
- "filename": "../../create-schemas-load-data/create-schemas-load-data.md"
+ "filename": "../../configure-the-autonomous-database-environment/configure-the-autonomous-database-environment.md"
},
{
"title": "Lab 2: Use Redaction to anonymize all REST Get calls and queries",