diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index cdba2f74..6c599da5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -56,15 +56,15 @@ jobs:
       - name: Build CRDs
         run: |
           kustomize build manifests/crds > all-crds.yaml
+      # Pinned to commit before https://github.com/fluxcd/pkg/pull/189 due to
+      # introduction faulty behavior.
       - name: Generate OpenAPI JSON schemas from CRDs
-        uses: fluxcd/pkg//actions/crdjsonschema@main
+        uses: fluxcd/pkg//actions/crdjsonschema@49e26aa2ee9e734c3233c560253fd9542afe18ae
         with:
           crd: all-crds.yaml
           output: schemas
-          combined_filename: crd-schemas.json
       - name: Archive the OpenAPI JSON schemas
         run: |
-          mv schemas/crd-schemas.json ./output/crd-schemas.json
           tar -czvf ./output/crd-schemas.tar.gz -C schemas .
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v1
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 480c3ba2..b57017b1 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -83,7 +83,6 @@ release:
     - glob: ./output/crd-schemas.tar.gz
     - glob: ./output/manifests.tar.gz
     - glob: ./output/install.yaml
-    - glob: ./output/crd-schemas.json
 dockers:
 - image_templates:
     - 'fluxcd/flux-cli:{{ .Tag }}-amd64'