diff --git a/knplabs/github-api/2.6/config/packages/github_api.yaml b/knplabs/github-api/2.6/config/packages/github_api.yaml
index ff68959b..35102948 100644
--- a/knplabs/github-api/2.6/config/packages/github_api.yaml
+++ b/knplabs/github-api/2.6/config/packages/github_api.yaml
@@ -1,6 +1,13 @@
 services:
     Github\Client:
-        class: Github\Client
+        arguments:
+            - '@Github\HttpClient\Builder'
         # Uncomment to enable authentication
         #calls:
         #    - ['authenticate', ['%env(GITHUB_USERNAME)%', '%env(GITHUB_SECRET)%', '%env(GITHUB_AUTH_METHOD)%']]
+
+    Github\HttpClient\Builder:
+        arguments:
+            - '@?Http\Client\HttpClient'
+            - '@?Http\Message\RequestFactory'
+            - '@?Http\Message\StreamFactory'