diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index c9691569..fcbb6610 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -35,17 +35,12 @@
 (setq user-emacs-directory "~/.cache/emacs/")
 
 (when (require 'package nil t)
-  ;; TODO: MELPA's https sometimes return
-  ;;   emacs melpa invalid: certificate host does not match hostname
-  ;; Try the following:
-  ;;   (setq tls-checktrust nil)
-  ;; Different Emacs version have different byte code.  If a versioned ELPA
+  ;; Different Emacs versions have different byte code.  If a versioned ELPA
   ;; directory is found, use it.
   (let ((versioned-dir (format "elpa-%s.%s" emacs-major-version emacs-minor-version)))
     (when (member versioned-dir (directory-files (expand-file-name ".." package-user-dir)))
       (setq package-user-dir (expand-file-name (concat "../" versioned-dir) package-user-dir))))
-  (setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/")))
-  (add-to-list 'package-archives '("melpa" . "https://melpa.milkbox.net/packages/"))
+  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
   (add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/") t)
   (package-initialize))