diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json
index 12870f3..83e736e 100644
--- a/nvim/dot-config/nvim/lazy-lock.json
+++ b/nvim/dot-config/nvim/lazy-lock.json
@@ -21,7 +21,6 @@
   "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
   "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
   "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
-  "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
   "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
   "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
@@ -41,6 +40,7 @@
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "todo-comments.nvim": { "branch": "main", "commit": "f8bd47e4bc15e3aa7c784b12e68b6dd6e97caea2" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
+  "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "b24b97c538b71b6de0ce9d84e47df27b6ecafd76" },
   "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
   "yaml-companion.nvim": { "branch": "main", "commit": "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0" }
diff --git a/nvim/dot-config/nvim/lua/plugins/autopairs.lua b/nvim/dot-config/nvim/lua/plugins/autopairs.lua
index 5ebe082..6205e6e 100644
--- a/nvim/dot-config/nvim/lua/plugins/autopairs.lua
+++ b/nvim/dot-config/nvim/lua/plugins/autopairs.lua
@@ -1,6 +1,27 @@
--- https://github.com/windwp/nvim-autopairs
+-- https://github.com/altermo/ultimate-autopair.nvim
 return {
-	"windwp/nvim-autopairs",
-	event = "InsertEnter",
-	config = true,
+	"altermo/ultimate-autopair.nvim",
+	event = { "InsertEnter", "CmdlineEnter" },
+	branch = "v0.6",
+	opts = {
+		fastwarp = {
+			faster = true,
+		},
+		-- Fix single quotes in rust
+		config_internal_pairs = {
+			{
+				"'",
+				"'",
+				multiline = false,
+				nft = {},
+				suround = true,
+				cond = function(fn)
+					if fn.get_ft() ~= "rust" then
+						return true
+					end
+					return not fn.in_node({ "bounded_type", "reference_type", "type_arguments", "type_parameters" })
+				end,
+			},
+		},
+	},
 }