diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77ccb1527..d99b23355 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
     if: ${{ fromJSON(needs.change_detect.outputs.source_modified) }}
     name: ${{ matrix.config.name }}
     runs-on: ubuntu-18.04
-    container: ghcr.io/lnis-uofu/openfpga-build-${{ matrix.config.cc}}
+    container: ghcr.io/${{ github.repository_owner }}/openfpga-build-${{ matrix.config.cc}}
     # Branch on different OS and settings
     strategy:
       fail-fast: false
@@ -194,12 +194,12 @@ jobs:
           file: ./docker/Dockerfile.master
           push: ${{ github.ref == 'refs/heads/master' || needs.change_detect.outputs.force_upload }}
           tags: |
-            ghcr.io/lnis-uofu/openfpga-master:latest
-            ghcr.io/lnis-uofu/openfpga-master:${{ needs.change_detect.outputs.sha_short }}
+            ghcr.io/${{github.repository_owner}}/openfpga-master:latest
+            ghcr.io/${{github.repository_owner}}/openfpga-master:${{ needs.change_detect.outputs.sha_short }}
   linux_regression_tests:
     name: linux_regression_tests
     runs-on: ubuntu-18.04
-    container: ghcr.io/lnis-uofu/openfpga-env
+    container: ghcr.io/${{github.repository_owner}}/openfpga-env
     needs: linux_build
     strategy:
       fail-fast: false
@@ -248,7 +248,7 @@ jobs:
     if: ${{ !fromJSON(needs.change_detect.outputs.source_modified) }}
     name: docker_regression_tests
     runs-on: ubuntu-18.04
-    container: ghcr.io/lnis-uofu/openfpga-master:latest
+    container: ghcr.io/${{github.repository_owner}}/openfpga-master:latest
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bfce9fc79..d51cf1120 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,14 +24,14 @@ jobs:
           context: .
           file: ./docker/Dockerfile.base
           push: true
-          tags: ghcr.io/lnis-uofu/openfpga-build-base:latest
+          tags: ghcr.io/${{ github.repository_owner }}/openfpga-build-base:latest
       - name: Build environment image
         uses: docker/build-push-action@v2
         with:
           context: .
           file: ./docker/Dockerfile.env
           push: true
-          tags: ghcr.io/lnis-uofu/openfpga-env:latest
+          tags: ghcr.io/${{ github.repository_owner }}/openfpga-env:latest
   compiler_images:
     name: Build ${{ matrix.compiler }} compiler image
     needs: base_images
@@ -65,4 +65,4 @@ jobs:
           context: .
           file: ./docker/Dockerfile.${{ matrix.compiler }}
           push: true
-          tags: ghcr.io/lnis-uofu/openfpga-build-${{ matrix.compiler }}:latest
+          tags: ghcr.io/${{ github.repository_owner }}/openfpga-build-${{ matrix.compiler }}:latest