diff --git a/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml b/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml
deleted file mode 100644
index 770ad4d8..00000000
--- a/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-endroid_google_api:
-    api_key: '%env(GOOGLE_API_KEY)%'
diff --git a/google/apiclient/2.0/config/packages/google_apiclient.yaml b/google/apiclient/2.0/config/packages/google_apiclient.yaml
new file mode 100644
index 00000000..c073b0a0
--- /dev/null
+++ b/google/apiclient/2.0/config/packages/google_apiclient.yaml
@@ -0,0 +1,5 @@
+services:
+    Google_Client:
+        class: Google_Client
+        calls:
+            - [setDeveloperKey, ['%env(GOOGLE_API_KEY)%']]
diff --git a/endroid/google-api-bundle/2.0/manifest.json b/google/apiclient/2.0/manifest.json
similarity index 56%
rename from endroid/google-api-bundle/2.0/manifest.json
rename to google/apiclient/2.0/manifest.json
index 4f37a162..d1ddc21b 100644
--- a/endroid/google-api-bundle/2.0/manifest.json
+++ b/google/apiclient/2.0/manifest.json
@@ -1,7 +1,4 @@
 {
-    "bundles": {
-        "Endroid\\GoogleApiBundle\\EndroidGoogleApiBundle": ["all"]
-    },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"
     },