diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9c30dbb07..167604b1d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -149,7 +149,6 @@ jobs:
               CABAL_PROJECT: "cabal.project"
               DISABLE_TEST: "yes"
               DISABLE_BENCH: "yes"
-              DISABLE_DIST_CHECKS: "yes"
               DISABLE_SDIST_BUILD: "yes"
             command: |
               apt-get install -y ghc-8.10.4
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 33ec42b8a..f1d291b63 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -95,14 +95,14 @@ jobs:
             cabal_project: cabal.project
             disable_sdist_build: "y"
             ignore_error: false
-          - name: 9.0.2
+          - name: 9.0.2-streamly-sdist
             ghc_version: 9.0.2
             runner: ubuntu-latest
             build: cabal
             cabal_version: 3.6.2.0
             cabal_project: cabal.project.streamly
             ignore_error: true
-          - name: 8.10.7-sdist-stack
+          - name: 8.10.7-streamly-sdist-stack
             runner: ubuntu-latest
             build: stack
             resolver: lts-18.23
@@ -134,29 +134,32 @@ jobs:
             disable_sdist_build: "y"
             cabal_build_options: "--flag fusion-plugin --flag inspection"
             ignore_error: false
-          - name: 8.8.4-sdist-fusion
+          - name: 8.8.4-fusion
             ghc_version: 8.8.4
             runner: ubuntu-latest
             build: cabal
             cabal_version: 3.6.2.0
-            cabal_project: cabal.project.streamly
+            cabal_project: cabal.project
             cabal_build_options: "--flag fusion-plugin"
+            disable_sdist_build: "y"
             ignore_error: false
-          - name: 8.6.5-sdist-no-fusion-unoptimized
+          - name: 8.6.5-no-fusion-unoptimized
             ghc_version: 8.6.5
             runner: ubuntu-latest
             build: cabal
             cabal_version: 3.6.2.0
-            cabal_project: cabal.project.streamly
+            cabal_project: cabal.project
             cabal_build_options: "--flag no-fusion --flag -opt"
+            disable_sdist_build: "y"
             ignore_error: false
-          - name: 8.6.5-sdist-debug-unoptimized
+          - name: 8.6.5-debug-unoptimized
             ghc_version: 8.6.5
             runner: ubuntu-latest
             build: cabal
             cabal_version: 3.6.2.0
-            cabal_project: cabal.project.streamly
+            cabal_project: cabal.project
             cabal_build_options: "--flag debug --flag -opt"
+            disable_sdist_build: "y"
             ignore_error: false
 
     steps:
diff --git a/.packcheck.ignore b/.packcheck.ignore
index 3ed44931c..bc6887816 100644
--- a/.packcheck.ignore
+++ b/.packcheck.ignore
@@ -22,10 +22,10 @@ cabal.project.hpc-coveralls
 cabal.project.O0
 cabal.project.report
 cabal.project.packdiff
+cabal.project.streamly
 cabal.project.Werror
 cabal.project.Werror-nocode
-cabal.project.902
-cabal.project.streamly
+core/
 default.nix
 examples/README.md
 hie.yaml
@@ -34,4 +34,3 @@ targets/default.nix
 targets/cabal.project
 test/test-runner/default.nix
 test/test-runner/cabal.project
-core/