diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1e1adff06..a561ba589 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -300,9 +300,11 @@ jobs:
           cmake --install build
       - name: Checkout heffte
         if: ${{ matrix.heffte != 'OFF' }}
-        # actions/checkout doesn't work for external repos yet (actions/checkout#447)
-        run: |
-          git clone --depth 1 --branch v2.3.0 https://bitbucket.org/icl/heffte.git heffte
+        uses: actions/checkout@v3
+        with:
+          repository: icl-utk-edu/heffte
+          ref: v2.3.0
+          path: heffte
       - name: Build heffte
         if: ${{ matrix.heffte != 'OFF' }}
         working-directory: heffte
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 980e4c7db..dc18f4c3a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -130,7 +130,7 @@ RUN FFTW_URL=http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz && \
 # Install heffte
 ARG HEFFTE_VERSION=2.3.0
 ENV HEFFTE_DIR=/opt/heffte
-RUN HEFFTE_URL=https://bitbucket.org/icl/heffte/get/v${HEFFTE_VERSION}.tar.gz && \
+RUN HEFFTE_URL=https://github.com/icl-utk-edu/heffte/archive/v${HEFFTE_VERSION}.tar.gz && \
     HEFFTE_ARCHIVE=heffte.tar.gz && \
     SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
     wget --quiet ${HEFFTE_URL} --output-document=${HEFFTE_ARCHIVE} && \
diff --git a/docker/Dockerfile.hipcc b/docker/Dockerfile.hipcc
index 393f7aaff..9a69e5505 100644
--- a/docker/Dockerfile.hipcc
+++ b/docker/Dockerfile.hipcc
@@ -135,7 +135,7 @@ RUN FFTW_URL=http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz && \
 # Install heffte
 ARG HEFFTE_VERSION=2.3.0
 ENV HEFFTE_DIR=/opt/heffte
-RUN HEFFTE_URL=https://bitbucket.org/icl/heffte/get/v${HEFFTE_VERSION}.tar.gz && \
+RUN HEFFTE_URL=https://github.com/icl-utk-edu/heffte/archive/v${HEFFTE_VERSION}.tar.gz && \
     HEFFTE_ARCHIVE=heffte.tar.gz && \
     SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
     wget --quiet ${HEFFTE_URL} --output-document=${HEFFTE_ARCHIVE} && \