diff --git a/e2e/build.gradle b/e2e/build.gradle
index dbc322cda..7fd484106 100644
--- a/e2e/build.gradle
+++ b/e2e/build.gradle
@@ -11,8 +11,8 @@ java {
 
 dependencies {
     //client
-    implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.2'
-    implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.2.2'
+    implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
+    implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.2.1'
 
     //jackson
     implementation 'com.fasterxml.jackson.core:jackson-core:2.16.0'
diff --git a/shared/build.gradle b/shared/build.gradle
index 00d454eca..43e03a9a4 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -34,8 +34,8 @@ dependencies {
     api 'org.fhir:ucum:1.0.8'
 
     // Apache Client
-    implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.2'
-    implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.2.2'
+    implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
+    implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.2.1'
 
     // jjwt
     implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
diff --git a/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/apache/ApacheClient.java b/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/apache/ApacheClient.java
index c9ac40f53..9d1c554e0 100644
--- a/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/apache/ApacheClient.java
+++ b/shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/apache/ApacheClient.java
@@ -5,9 +5,7 @@
 import java.io.IOException;
 import java.util.Map;
 import org.apache.hc.client5.http.fluent.Request;
-import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.apache.hc.core5.http.message.BasicHeader;
 
 /**
  * This class implements HttpClient and is a "humble object" for the Apache Client 5 library. Using
@@ -27,29 +25,16 @@ public static ApacheClient getInstance() {
     @Override
     public String post(String url, Map<String, String> headerMap, String body)
             throws HttpClientException {
-        Header[] headers = convertMapToHeader(headerMap);
 
         try {
-            return Request.post(url)
-                    .setHeaders(headers)
-                    .body(new StringEntity(body))
-                    .execute()
-                    .returnContent()
-                    .asString();
+            Request request = Request.post(url).body(new StringEntity(body));
+            if (headerMap != null) {
+                headerMap.forEach(request::addHeader);
+            }
+            return request.execute().returnContent().asString();
         } catch (IOException e) {
             throw new HttpClientException(
                     "Error occurred while making HTTP request to [" + url + "]", e);
         }
     }
-
-    protected Header[] convertMapToHeader(Map<String, String> headerMap) {
-
-        if (headerMap == null) {
-            return new Header[0];
-        }
-
-        return headerMap.entrySet().stream()
-                .map(entry -> new BasicHeader(entry.getKey(), entry.getValue()))
-                .toArray(Header[]::new);
-    }
 }
diff --git a/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/apache/ApacheClientTest.groovy b/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/apache/ApacheClientTest.groovy
index 1af4b8af2..eb128088a 100644
--- a/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/apache/ApacheClientTest.groovy
+++ b/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/apache/ApacheClientTest.groovy
@@ -6,26 +6,6 @@ import spock.lang.Specification
 
 class ApacheClientTest extends Specification {
 
-    def "convertMapToHeader works"() {
-        given:
-        def headerMap = [
-            "key": "value",
-            "name": "dogCow",
-            "first": "last"
-        ]
-        def bhArr = [
-            new BasicHeader("key", "value"),
-            new BasicHeader("name", "dogCow"),
-            new BasicHeader("first", "last")
-        ]
-
-        when:
-        def actual = ApacheClient.getInstance().convertMapToHeader(headerMap)
-
-        then:
-        actual.toString() == bhArr.toString()
-    }
-
     def "Http request with error"() {
         given:
         def httpClient = ApacheClient.getInstance()