diff --git a/.circleci/config.yml b/.circleci/config.yml
index 42d610c..e98b870 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,23 +23,17 @@ workflows:
           <<: *defaults
           name: "ghc-8.8.3 / lts-16.10"
           stack-yaml: stack-lts-16.10.yaml
+      - stack-build/build-test-nightly:
+          name: "nightly"
 
-  # nightly is broken due to persistent/persistent-template situation
-  # https://app.circleci.com/pipelines/github/thoughtbot/yesod-auth-oauth2/172/workflows/1b5d2999-369d-411b-837d-9ccae4f4cede/jobs/1273
-
-      # - stack-build/build-test-nightly:
-      #     name: "nightly"
-      #     stack-yaml: stack-nightly.yaml
-
-  # nightly:
-  #   triggers:
-  #     - schedule:
-  #         cron: "0 0 * * *"
-  #         filters:
-  #           branches:
-  #             only:
-  #               - master
-  #   jobs:
-  #     - stack-build/build-test-nightly:
-  #         name: "nightly"
-  #         stack-yaml: stack-nightly.yaml
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - stack-build/build-test-nightly:
+          name: "nightly"
diff --git a/Makefile b/Makefile
index fbb84c3..47448b5 100644
--- a/Makefile
+++ b/Makefile
@@ -43,11 +43,11 @@ lint:
 
 .PHONY: nightly
 nightly:
-	stack setup --stack-yaml stack-nightly.yaml --resolver nightly
-	stack build --stack-yaml stack-nightly.yaml --resolver nightly \
+	stack setup --resolver nightly
+	stack build --resolver nightly \
 	  --test --no-run-tests --bench --no-run-benchmarks \
 	  --dependencies-only
-	stack build --stack-yaml stack-nightly.yaml --resolver nightly \
+	stack build --resolver nightly \
 	  --test --no-run-tests --bench --no-run-benchmarks \
 	  --fast --pedantic
 
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
deleted file mode 100644
index cc70457..0000000
--- a/stack-nightly.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Overridden by --resolver on CI
-resolver: nightly-2020-08-19
-extra-deps:
-  - yesod-auth-1.6.10@sha256:c1d923621306c6a625553fd02ab805619de405707f22eb09c9b0c0f3c9e7bd0c,3038
-
-  # for yesod-auth
-  - yesod-form-1.6.7@sha256:b216bb4eb0575d4fcc497b1d7f47edf25fc9035ab3ae8b77bf7fcbedc15dd2ea,3350
-  - yesod-persistent-1.6.0.4@sha256:4e8d00ca5e347bb8efa246ec272200f71597c62369dbbf66bb50216968b8f926,1692
-
-  # for yesod-persistent
-  - persistent-template-2.8.3.1@sha256:83ea6047a52ad0379ad958e6126ff289021238ed0ae4f9cf8edb8e094524f2a3,2774
-
-# Because persistent-template requires persistent >= 2.11, which does not exist
-allow-newer: true
diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock
deleted file mode 100644
index 73a2a86..0000000
--- a/stack-nightly.yaml.lock
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was autogenerated by Stack.
-# You should not edit this file by hand.
-# For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
-
-packages:
-- completed:
-    hackage: hoauth2-1.8.9@sha256:63929253f6cdeb096a369980d2acf0d7eedd0c98ac46f962f717c56b724069a4,5734
-    pantry-tree:
-      size: 1986
-      sha256: 1c2901e88e82128b1e7f46e4b58eaeec779a630f0e30eb8bc226cb8ebb521bf8
-  original:
-    hackage: hoauth2-1.8.9@sha256:63929253f6cdeb096a369980d2acf0d7eedd0c98ac46f962f717c56b724069a4,5734
-snapshots:
-- completed:
-    size: 434661
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2019/11/29.yaml
-    sha256: 9edba401b588c0b8359262043b51f0bd33e2334802f0a1467eb660a23601eaf6
-  original: nightly-2019-11-29