diff --git a/Changelog.md b/Changelog.md
index 4389a0089da51fe8f66dbcf91ca0886edf923af9..098304bbee79f48e19d40a5ccda69e16f61b32aa 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 ## Refactor
 * Set better example values for unicorn stdout/stderr log settings [#8058](https://github.com/diaspora/diaspora/pull/8058)
+* Replace dependency on rails-assets.org with custom gems cache at gems.diasporafoundation.org [#8087](https://github.com/diaspora/diaspora/pull/8087)
 
 ## Bug fixes
 * Fix error while trying to fetch some sites with invalid OpenGraph data [#8049](https://github.com/diaspora/diaspora/pull/8049)
diff --git a/Gemfile b/Gemfile
index 87a3965d4e6168773dd99a94ecc0e5525eb6a18c..08653baa55eed270ea42d21f1a4a47f564d6c832 100644
--- a/Gemfile
+++ b/Gemfile
@@ -97,7 +97,7 @@ gem "jquery-rails",      "4.3.5"
 gem "js-routes",         "1.4.7"
 gem "js_image_paths",    "0.1.1"
 
-source "https://rails-assets.org" do
+source "https://gems.diasporafoundation.org" do
   gem "rails-assets-jquery",                              "3.4.1" # Should be kept in sync with jquery-rails
   gem "rails-assets-jquery.ui",                           "1.11.4"
 
@@ -173,7 +173,7 @@ gem "active_model_serializers", "0.9.7"
 
 # XMPP chat dependencies
 gem "diaspora-prosody-config",    "0.0.7"
-gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://rails-assets.org"
+gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://gems.diasporafoundation.org"
 
 # Tags
 
@@ -312,7 +312,7 @@ group :development, :test do
   # Jasmine (client side application tests (JS))
   gem "jasmine",                   "3.4.0"
   gem "jasmine-jquery-rails",      "2.0.3"
-  gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://rails-assets.org"
+  gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org"
   gem "sinon-rails",               "1.15.0"
 
   # For `assigns` in controller specs
diff --git a/Gemfile.lock b/Gemfile.lock
index a8c30bee37589c5dbe008ed96febfe8cdb8e8c4e..d09c9e391acc660f3a59f25e6a9a4db8f339bc81 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GEM
   remote: https://rubygems.org/
-  remote: https://rails-assets.org/
+  remote: https://gems.diasporafoundation.org/
   specs:
     actioncable (5.1.7)
       actionpack (= 5.1.7)