diff --git a/.gitmodules b/.gitmodules
index 69f9de16c..0e2f857b0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,7 +18,7 @@
 	url = https://github.com/kokkos/kokkos.git
 [submodule "external/papi"]
 	path = external/papi
-	url = https://bitbucket.org/icl/papi.git
+	url = https://github.com/icl-utk-edu/papi.git
 [submodule "external/pybind11"]
 	path = external/pybind11
 	url = https://github.com/jrmadsen/pybind11.git
diff --git a/cmake/ElfUtils.cmake b/cmake/ElfUtils.cmake
index f58cf0eed..df6a9a99c 100644
--- a/cmake/ElfUtils.cmake
+++ b/cmake/ElfUtils.cmake
@@ -104,6 +104,7 @@ externalproject_add(
     PREFIX ${PROJECT_BINARY_DIR}/external/elfutils
     URL ${ElfUtils_DOWNLOAD_URL}
         "https://sourceware.org/elfutils/ftp/${ElfUtils_DOWNLOAD_VERSION}/elfutils-${ElfUtils_DOWNLOAD_VERSION}.tar.bz2"
+        "https://mirrors.kernel.org/sourceware/elfutils/${ElfUtils_DOWNLOAD_VERSION}/elfutils-${ElfUtils_DOWNLOAD_VERSION}.tar.bz2"
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND
         ${CMAKE_COMMAND} -E env CC=${ElfUtils_C_COMPILER}
diff --git a/external/dyninst b/external/dyninst
index 1ed7d8550..3d1942dee 160000
--- a/external/dyninst
+++ b/external/dyninst
@@ -1 +1 @@
-Subproject commit 1ed7d855078f432f27c4e025c605290364f8f37c
+Subproject commit 3d1942dee70a0008a7bb9e5f18d8b4abc0a91290
diff --git a/external/papi b/external/papi
index effd1ef4e..3ce9001df 160000
--- a/external/papi
+++ b/external/papi
@@ -1 +1 @@
-Subproject commit effd1ef4e0fd4b80e36546791277215a2d6b9eba
+Subproject commit 3ce9001dff49e1b6b1653ffb429808795f71a0bd