diff --git a/package-lock.json b/package-lock.json
index 418e24b..3658787 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1878,9 +1878,9 @@
       "integrity": "sha512-XcdMT5PSZHiuf7LJIhzKIe+RyYa25S3LHRRvLnZc6iFjwXkrSDJ8J/HWO6VT8d2ZTbawp3VcLEjRF/VN8glCrA=="
     },
     "@google-cloud/firestore": {
-      "version": "3.8.5",
-      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-3.8.5.tgz",
-      "integrity": "sha512-MMUiQRhraXybayNZ6vbs+tLUq/TwXi7i40NEY9W5Wo5f4tX3SxX0km6FFbnNBy6pAEwpkZ02s0RMVy/RsMeGqA==",
+      "version": "3.8.6",
+      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-3.8.6.tgz",
+      "integrity": "sha512-ox80NbrM1MLJgvAAUd1quFLx/ie/nSjrk1PtscSicpoYDlKb9e6j7pHrVpbopBMyliyfNl3tLJWaDh+x+uCXqw==",
       "optional": true,
       "requires": {
         "deep-equal": "^2.0.0",
@@ -7198,12 +7198,32 @@
       "dev": true
     },
     "geofirestore": {
-      "version": "github:MichaelSolati/geofirestore-js#83af3c3d5e9afc27cc59882af57c42e7104771eb",
-      "from": "github:MichaelSolati/geofirestore-js",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/geofirestore/-/geofirestore-4.1.0.tgz",
+      "integrity": "sha512-cgAoivoC3+OtOLRoeo6RReyAgTxlzwr57P6+o6aMzJ7N3Z9wd+ZQqd9TJgRnEj1am6117IuYyI1/kzEXPWru7w==",
       "requires": {
         "@google-cloud/firestore": ">= 2.0.0",
         "@types/node": ">= 8.0.0",
-        "firebase": ">= 6.0.0"
+        "firebase": ">= 6.0.0",
+        "geofirestore-core": "^4.0.0"
+      }
+    },
+    "geofirestore-core": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/geofirestore-core/-/geofirestore-core-4.0.0.tgz",
+      "integrity": "sha512-l7KxAeetljcxvnpsAFv9OrJRzTytuyD9aAHXVd4ewPneIYlj+7mCVb92deb8IxQopg0dRZjtCiEcUdd+RuRwcA==",
+      "requires": {
+        "@google-cloud/firestore": ">= 2.0.0",
+        "@types/node": ">= 8.0.0",
+        "firebase": ">= 6.0.0",
+        "geokit": "^1.1.0"
+      },
+      "dependencies": {
+        "geokit": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/geokit/-/geokit-1.1.0.tgz",
+          "integrity": "sha512-kTxs9TomJKBmK9J2RFNH1s4jy/3WN1vpmNfjyAIQRcM1jfuSqHMwLLPLe7ZbcTixGHNoqHyFyu/1b8YMR/zvVA=="
+        }
       }
     },
     "geokit": {
diff --git a/package.json b/package.json
index 5d5af19..05afe45 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@angular/platform-browser-dynamic": "~9.1.11",
     "@angular/router": "~9.1.11",
     "firebase": "^7.15.1",
-    "geofirestore": "github:MichaelSolati/geofirestore-js",
+    "geofirestore": "^4.1.0",
     "geokit": "^0.1.5",
     "normalize.css": "^8.0.1",
     "rxjs": "~6.5.4",