diff --git a/config-min.org b/config-min.org
index 6c7be49..361ea7d 100644
--- a/config-min.org
+++ b/config-min.org
@@ -557,7 +557,7 @@
   (define-key emacs-lisp-mode-map (kbd "C-c C-e") 'my/eval-and-replace)
 
   ;; Use cider's eval expression
-  (let ((fetcher (if my-ec/at-ti "github" "github-ssh"))
+  (let ((fetcher (if (or noninteractive my-ec/at-ti) "github" "github-ssh"))
         (quelpa-build-default-files-spec
          '("*.el" (:exclude ".dir-locals.el"))))
     (quelpa `(cider :repo "clojure-emacs/cider" :branch "master" :fetcher ,fetcher)))
diff --git a/config-programming.org b/config-programming.org
index aa4f63b..596302e 100644
--- a/config-programming.org
+++ b/config-programming.org
@@ -32,7 +32,7 @@
 #+end_src
 * Yasnippets
 #+BEGIN_SRC emacs-lisp
-  (let ((fetcher (if my-ec/at-ti "github" "github-ssh")))
+  (let ((fetcher (if (or noninteractive my-ec/at-ti) "github" "github-ssh")))
     (quelpa `(yasnippet :repo "pestctrl/yasnippet" :branch "quit-undo-tree" :fetcher ,fetcher)))
   (use-package java-snippets)
 #+END_SRC
diff --git a/lisp/org-config/my-org-agenda-commands.el b/lisp/org-config/my-org-agenda-commands.el
index e2966cd..cdf5630 100644
--- a/lisp/org-config/my-org-agenda-commands.el
+++ b/lisp/org-config/my-org-agenda-commands.el
@@ -40,7 +40,7 @@
 (use-package peg)
 (use-package ov)
 (use-package dash-functional)
-(let ((fetcher (if my-ec/at-ti "github" "github-ssh")))
+(let ((fetcher (if (or noninteractive my-ec/at-ti) "github" "github-ssh")))
   (quelpa `(org-ql :repo "pestctrl/org-ql" :branch "my-changes" :fetcher ,fetcher)))
 (require 'org-ql)
 (require 'org-ql-search)
diff --git a/lisp/org-config/my-org-misc.el b/lisp/org-config/my-org-misc.el
index 76ca2f9..26414eb 100644
--- a/lisp/org-config/my-org-misc.el
+++ b/lisp/org-config/my-org-misc.el
@@ -157,7 +157,7 @@
   (define-key org-agenda-mode-map (kbd "j")
     #'org-agenda-jump-to-heading-show))
 
-(let ((fetcher (if my-ec/at-ti "github" "github-ssh")))
+(let ((fetcher (if (or noninteractive my-ec/at-ti) "github" "github-ssh")))
   (quelpa `(org-ql :repo "pestctrl/org-ql" :branch "my-changes" :fetcher ,fetcher)))
 (require 'org-ql-find)
 
diff --git a/lisp/use-exwm.el b/lisp/use-exwm.el
index 98fa0ce..05ae334 100644
--- a/lisp/use-exwm.el
+++ b/lisp/use-exwm.el
@@ -32,7 +32,7 @@
   `(use-package exwm
      :ensure nil
      :defer t
-     :quelpa (exwm :fetcher ,(if my-ec/at-ti "github" "github-ssh") :repo "pestctrl/exwm")
+     :quelpa (exwm :fetcher ,(if (or noninteractive my-ec/at-ti) "github" "github-ssh") :repo "pestctrl/exwm")
      ,@body))
 
 (provide 'use-exwm)