diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd7d35f94..8888c12b2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,13 +42,11 @@ jobs:
         experimental:
           - false
         include:
-          # NOTE: PG shard does not compile on Windows https://github.com/will/crystal-pg/issues/291
-          # Until that's resolved, this will always fail, so leaving this commented out for now
-          # - shard_file: shard.yml
-          #   crystal_version: latest
-          #   postgres_version: 16
-          #   experimental: true
-          #   os: windows-latest
+          - os: windows-latest
+            shard_file: shard.yml
+            crystal_version: latest
+            postgres_version: 16
+            experimental: true
           - shard_file: shard.edge.yml
             crystal_version: latest
             postgres_version: 14
@@ -89,7 +87,7 @@ jobs:
         env:
           DATABASE_URL: postgres://lucky:developer@localhost:5432/avram_dev
       - name: Run tests
-        run: crystal spec
+        run: crystal spec --error-trace
         env:
           BACKUP_DATABASE_URL: postgres://lucky:developer@localhost:5432/sample_backup
           DATABASE_URL: postgres://lucky:developer@localhost:5432/avram_dev
diff --git a/.gitignore b/.gitignore
index 5eb9a8cb6..9ac5afd3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,15 @@
 /lib/
 /bin/ameba
 /bin/ameba.cr
+/bin/lucky.exec.cr
+/bin/lucky.watch.cr
+/bin/lucky.gen.action.cr
+/bin/lucky.gen.action.browser.cr
+/bin/lucky.gen.action.api.cr
+/bin/lucky.gen.page.cr
+/bin/lucky.gen.component.cr
+/bin/lucky.gen.task.cr
+/bin/lucky.gen.secret_key.cr
 /.shards/
 /tmp
 /config/*.local.cr
diff --git a/shard.yml b/shard.yml
index c3cc28c38..66325350f 100644
--- a/shard.yml
+++ b/shard.yml
@@ -17,7 +17,7 @@ dependencies:
     version: ~> 0.3.0
   pg:
     github: will/crystal-pg
-    version: ~> 0.28.0
+    version: ~> 0.29.0
   habitat:
     github: luckyframework/habitat
     version: ~> 0.4.9
@@ -49,4 +49,5 @@ development_dependencies:
     version: ~> 1.5.0
   lucky:
     github: luckyframework/lucky
-    version: ">= 1.0.0"
+    branch: main
+    # version: ">= 1.0.0"