diff --git a/exposed-panels/oracle-containers-panel.yaml b/exposed-panels/oracle-containers-panel.yaml
new file mode 100644
index 0000000000..f1b41169bb
--- /dev/null
+++ b/exposed-panels/oracle-containers-panel.yaml
@@ -0,0 +1,30 @@
+id: oracle-containers-panel
+
+info:
+  name: Oracle Containers for J2EE 10g Panel
+  author: dogasantos
+  severity: info
+  tags: panel,oracle,containers
+
+requests:
+  - method: GET
+    path:
+      - "{{BaseURL}}"
+
+    matchers-condition: and
+    matchers:
+      - type: word
+        words:
+          - "Welcome to Oracle Containers for J2EE 10g"
+          - "Administration Guide is included"
+        condition: or
+
+      - type: status
+        status:
+          - 200
+
+    extractors:
+      - type: regex
+        group: 1
+        regex:
+          - 'Oracle Containers for J2EE 10g \(.*\)'
diff --git a/exposed-panels/oracle-enterprise-manager-login.yaml b/exposed-panels/oracle-enterprise-manager-login.yaml
new file mode 100644
index 0000000000..951c5ad751
--- /dev/null
+++ b/exposed-panels/oracle-enterprise-manager-login.yaml
@@ -0,0 +1,25 @@
+id: oracle-enterprise-manager-login
+
+info:
+  name: Oracle Enterprise Manager login
+  author: dogasantos
+  severity: info
+  tags: panel,oracle,manager,login
+
+requests:
+  - method: GET
+    path:
+      - "{{BaseURL}}/em/console/logon/logon"
+
+    matchers-condition: and
+    matchers:
+      - type: word
+        words:
+          - "Oracle UIX"
+          - "libNPSVG3.so"
+          - "Oracle Enterprise Manager"
+        condition: or
+
+      - type: status
+        status:
+          - 200
diff --git a/workflows/microsoft-exchange-workflow.yaml b/workflows/microsoft-exchange-workflow.yaml
index d3b92b5381..b56e92ef09 100644
--- a/workflows/microsoft-exchange-workflow.yaml
+++ b/workflows/microsoft-exchange-workflow.yaml
@@ -6,6 +6,6 @@ info:
   description: A simple workflow that runs all Microsoft Exchange related nuclei templates on a given target.
 
 workflows:
-  - template: technologies/microsoft/microsoft-exchange-server-detect.yaml
+  - template: technologies/microsoft/ms-exchange-server.yaml
     subtemplates:
       - tags: exchange
\ No newline at end of file