diff --git a/nifi-pulsar-client-service/pom.xml b/nifi-pulsar-client-service/pom.xml
index 83bc58b..52adad9 100644
--- a/nifi-pulsar-client-service/pom.xml
+++ b/nifi-pulsar-client-service/pom.xml
@@ -26,6 +26,11 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+           <groupId>org.apache.pulsar</groupId>
+           <artifactId>pulsar-client-auth-athenz</artifactId>
+           <version>${pulsar.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-pulsar-client-service-api</artifactId>
@@ -43,11 +48,6 @@
             <version>1.9.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-ssl-context-service-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>
diff --git a/nifi-pulsar-client-service/src/main/java/org/apache/nifi/pulsar/auth/PulsarClientAthenzAuthenticationService.java b/nifi-pulsar-client-service/src/main/java/org/apache/nifi/pulsar/auth/PulsarClientAthenzAuthenticationService.java
index 736cd74..bc318aa 100644
--- a/nifi-pulsar-client-service/src/main/java/org/apache/nifi/pulsar/auth/PulsarClientAthenzAuthenticationService.java
+++ b/nifi-pulsar-client-service/src/main/java/org/apache/nifi/pulsar/auth/PulsarClientAthenzAuthenticationService.java
@@ -26,8 +26,9 @@
 import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.pulsar.client.api.Authentication;
 import org.apache.pulsar.client.api.AuthenticationFactory;
+import org.apache.pulsar.client.api.PulsarClientException.UnsupportedAuthenticationException;
+import org.apache.pulsar.client.impl.auth.AuthenticationAthenz;
 
-// import org.apache.pulsar.client.impl.auth.AuthenticationAthenz;
 
 /**
  * https://pulsar.apache.org/docs/en/security-athenz/
@@ -96,7 +97,6 @@ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
 	@Override
 	public Authentication getAuthentication() {
 		Map<String, String> authParams = new HashMap<>();
-		// TODO Define constants for these keys
 		authParams.put("tenantDomain", configContext.getProperty(TENANT_DOMAIN).getValue()); 
 		authParams.put("tenantService", configContext.getProperty(TENANT_SERVICE).getValue()); 
 		authParams.put("providerDomain", configContext.getProperty(PROVIDER_DOMAIN).getValue()); 
@@ -106,9 +106,12 @@ public Authentication getAuthentication() {
 		   authParams.put("keyId", configContext.getProperty(TENANT_PRIVATE_KEY_ID).getValue()); 
 		}
 
- //		return AuthenticationFactory.create(AuthenticationAthenz.class.getName(), authParams);
-
-		return null;
+ 		try {
+			return AuthenticationFactory.create(AuthenticationAthenz.class.getName(), authParams);
+		} catch (UnsupportedAuthenticationException e) {
+			getLogger().error("Unable to authenticate", e);
+			return null;
+		}
 	}
 
 }