diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index deb197bd9..c13940b5c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -416,8 +416,7 @@ jobs:
             ${{ steps.meta.outputs.bake-file }}
             ${{ steps.meta-debug.outputs.bake-file }}
           set: |
-            # This is broken: https://github.com/docker/bake-action/issues/136
-            # base.context=https://github.com/${{ github.repository }}.git#${{ github.ref }}
+            base.context=https://github.com/${{ github.repository }}.git#${{ github.ref }}
             base.platform=linux/amd64
             base.cache-from=type=registry,ref=${{ env.IMAGE }}:buildcache
 
@@ -431,8 +430,7 @@ jobs:
             ${{ steps.meta.outputs.bake-file }}
             ${{ steps.meta-debug.outputs.bake-file }}
           set: |
-            # This is broken: https://github.com/docker/bake-action/issues/136
-            # base.context=https://github.com/${{ github.repository }}.git#${{ github.ref }}
+            base.context=https://github.com/${{ github.repository }}.git#${{ github.ref }}
             base.output=type=image,push=true
             base.cache-from=type=registry,ref=${{ env.IMAGE }}:buildcache
             base.cache-to=type=registry,ref=${{ env.IMAGE }}:buildcache,mode=max