diff --git a/mendel.list.template b/mendel.list.template
index 21ad31f..ba7ff0f 100644
--- a/mendel.list.template
+++ b/mendel.list.template
@@ -1,4 +1,4 @@
-deb [arch=armhf,arm64 trusted=yes] https://packages.cloud.google.com/apt mendel-day main
-deb-src [trusted=yes] https://packages.cloud.google.com/apt mendel-day main
-deb [arch=armhf,arm64 trusted=yes] https://packages.cloud.google.com/apt mendel-bsp-%BOARDNAME%-day main
-deb-src [trusted=yes] https://packages.cloud.google.com/apt mendel-bsp-%BOARDNAME%-day main
+deb [arch=armhf,arm64 trusted=yes] https://mendel-linux.org/apt/eagle eagle main
+deb-src [trusted=yes] https://mendel-linux.org/apt/eagle eagle main
+deb [arch=armhf,arm64 trusted=yes] https://mendel-linux.org/apt/eagle eagle-bsp-%BOARDNAME% main
+deb-src [trusted=yes] https://mendel-linux.org/apt/eagle eagle-bsp-%BOARDNAME% main
diff --git a/packages.mk b/packages.mk
index a0e2ca2..c583156 100644
--- a/packages.mk
+++ b/packages.mk
@@ -28,10 +28,9 @@
 	mkdir -p $(ROOTDIR)/cache
 	sudo pbuilder create \
 		--basetgz $@ \
-		--othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main" \
 		--distribution buster \
 		--architecture amd64 \
-		--extrapackages "crossbuild-essential-armhf crossbuild-essential-arm64 debhelper gnupg lintian qemu-user-static" \
+		--extrapackages "crossbuild-essential-armhf crossbuild-essential-arm64 debhelper gnupg lintian qemu-user-static ca-certificates" \
 		--aptcache ""
 endif
 
@@ -43,10 +42,9 @@
 	mkdir -p $(ROOTDIR)/cache
 	sudo pbuilder create \
 		--basetgz $@ \
-		--othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main" \
 		--distribution buster \
 		--architecture $(USERSPACE_ARCH) \
-		--extrapackages "build-essential debhelper gnupg lintian" \
+		--extrapackages "build-essential debhelper gnupg lintian ca-certificates" \
 		--aptcache ""
 	mkdir -p $(ROOTDIR)/cache/base-tmp
 	cd $(ROOTDIR)/cache/base-tmp; \
diff --git a/pbuilder-hooks/D05deps b/pbuilder-hooks/D05deps
index a8a672a..dd871b3 100755
--- a/pbuilder-hooks/D05deps
+++ b/pbuilder-hooks/D05deps
@@ -3,9 +3,11 @@
 echo "deb [trusted=yes] file://$DEPSBASE ./" >> /etc/apt/sources.list
 
 if [[ -z "${IS_JENKINS}" ]]; then
-    echo "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-bsp-$BOARD_NAME-day main" >> /etc/apt/sources.list
+    echo "deb [arch=arm64] https://mendel-linux.org/apt/unstable unstable main" >> /etc/apt/sources.list
+    echo "deb [arch=arm64] https://mendel-linux.org/apt/unstable-bsp-$BOARD_NAME unstable main" >> /etc/apt/sources.list
 else
-    echo "deb [arch=arm64] https://mendel-linux.org/apt unstable-bsp-$BOARD_NAME unstable" >> /etc/apt/sources.list
+    echo "deb [arch=arm64] https://mendel-linux.org/apt/eagle eagle main" >> /etc/apt/sources.list
+    echo "deb [arch=arm64] https://mendel-linux.org/apt/eagle-bsp-$BOARD_NAME eagle main" >> /etc/apt/sources.list
 fi
 
 echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" >> /etc/apt/sources.list
diff --git a/pbuilderrc b/pbuilderrc
index 7f694e3..95bc64d 100644
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -4,7 +4,7 @@
 # the default template
 #
 # read pbuilderrc.5 document for notes on specific options.
-OTHERMIRROR="deb https://packages.cloud.google.com/apt mendel-day main|deb https://packages.cloud.google.com/apt mendel-bsp-$BOARD_NAME-day main"
+OTHERMIRROR="deb https://mendel-linux.org/apt/eagle eagle main|deb https://mendel-linux.org/apt/eagle eagle-bsp-$BOARD_NAME main"
 PBUILDERSATISFYDEPENDSCMD=/usr/lib/pbuilder/pbuilder-satisfydepends-apt
 export DEPSBASE=$PRODUCT_OUT/packages
 BINDMOUNTS="$DEPSBASE $ROOTDIR"