diff --git a/lua/astrocommunity/pack/full-dadbod/init.lua b/lua/astrocommunity/pack/full-dadbod/init.lua
index 48c16ab6c..5e2bd5261 100644
--- a/lua/astrocommunity/pack/full-dadbod/init.lua
+++ b/lua/astrocommunity/pack/full-dadbod/init.lua
@@ -10,10 +10,19 @@ return {
         "DBUIAddConnection",
         "DBUIFindBuffer",
       },
-      init = function()
-        vim.g.db_ui_use_nerd_fonts = 1
-        vim.g.completion_matching_ignore_case = 1
-      end,
+      specs = {
+        {
+          "AstroNvim/astrocore",
+          opts = {
+            options = {
+              g = {
+                db_use_nerd_fonts = vim.g.icons_enabled and 1 or nil,
+                completion_matching_ignore_case = 1,
+              },
+            },
+          },
+        },
+      },
     },
     {
       "hrsh7th/nvim-cmp",
@@ -29,7 +38,7 @@ return {
                   {
                     event = "FileType",
                     desc = "dadbod completion",
-                    pattern = { "sql", "mysql", "plsql", "pg" },
+                    pattern = { "sql", "mysql", "plsql" },
                     callback = function()
                       require("cmp").setup.buffer { sources = { { name = "vim-dadbod-completion" } } }
                     end,
@@ -41,6 +50,9 @@ return {
                   command = "set filetype=sql",
                 },
               },
+              filetypes = {
+                extension = { pg = "sql" },
+              },
             },
           },
         },