diff --git a/mail/src/main/java/org/jboss/as/quickstarts/mail/Email.java b/mail/src/main/java/org/jboss/as/quickstarts/mail/Email.java
index dbb51b2..25a1a60 100644
--- a/mail/src/main/java/org/jboss/as/quickstarts/mail/Email.java
+++ b/mail/src/main/java/org/jboss/as/quickstarts/mail/Email.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 
-import jakarta.annotation.Resource;
 import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.mail.Address;
 import jakarta.mail.Message;
@@ -53,7 +53,7 @@
      * Resource for sending the email. The mail subsystem is defined in either standalone.xml or domain.xml in your respective
      * configuration directory.
      */
-    @Resource(mappedName = "java:jboss/mail/MyOtherMail")
+    @Inject
     private Session mySession;
 
     private String to;
diff --git a/mail/src/main/java/org/jboss/as/quickstarts/mail/MailSessionProducer.java b/mail/src/main/java/org/jboss/as/quickstarts/mail/MailSessionProducer.java
new file mode 100644
index 0000000..ac93cbd
--- /dev/null
+++ b/mail/src/main/java/org/jboss/as/quickstarts/mail/MailSessionProducer.java
@@ -0,0 +1,15 @@
+package org.jboss.as.quickstarts.mail;
+
+import jakarta.annotation.Resource;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.mail.Session;
+
+@ApplicationScoped
+public class MailSessionProducer {
+	
+	@Produces
+	@Resource(mappedName = "java:jboss/mail/Default")
+    private Session mySession;
+	
+}