diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
deleted file mode 100644
index 78147a2..0000000
--- a/CRAN-SUBMISSION
+++ /dev/null
@@ -1,3 +0,0 @@
-Version: 0.1.0
-Date: 2025-02-20 07:39:24 UTC
-SHA: 9fceed941981ee5a49765c77b25e366e5a770e43
diff --git a/DESCRIPTION b/DESCRIPTION
index bacff1e..04d2b60 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: GitAI
 Title: Extracts Knowledge from 'Git' Repositories
-Version: 0.1.2
+Version: 0.1.3
 Authors@R: c(
     person("Kamil", "Wais", , "kamil.wais@gmail.com", role = c("aut", "cre")),
     person("Krystian", "Igras", , "krystian8207@gmail.com", role = "aut"),
@@ -11,12 +11,12 @@ License: MIT + file LICENSE
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 URL: https://github.com/r-world-devs/GitAI
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3
 Depends:
     R (>= 4.1.0)
 Imports:
     cli (>= 3.4.0),
-    ellmer,
+    ellmer (>= 0.4.0),
     GitStats (>= 2.2.0),
     httr2,
     lubridate,
diff --git a/NEWS.md b/NEWS.md
index c5d7b9d..d0ab335 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,8 @@
+# GitAI 0.1.3
+
+* Fixes for CRAN.
+* Adjust to new `ellmer` release (`0.4.0`).
+
 # GitAI 0.1.2
 
 * Added GitHub URL to `DESCRIPTION`.
diff --git a/man/GitAI-package.Rd b/man/GitAI-package.Rd
index 85ba8bd..e500cf5 100644
--- a/man/GitAI-package.Rd
+++ b/man/GitAI-package.Rd
@@ -9,6 +9,13 @@
 \if{html}{\figure{logo.png}{options: style='float: right' alt='logo' width='120'}}
 
 Scan multiple 'Git' repositories, pull specified files content and process it with large language models. You can summarize the content in specific way, extract information and data, or find answers to your questions about the repositories. The output can be stored in vector database and used for semantic search or as a part of a RAG (Retrieval Augmented Generation) prompt.
+}
+\seealso{
+Useful links:
+\itemize{
+  \item \url{https://github.com/r-world-devs/GitAI}
+}
+
 }
 \author{
 \strong{Maintainer}: Kamil Wais \email{kamil.wais@gmail.com}
diff --git a/renv.lock b/renv.lock
index b127fd7..20d8ebe 100644
--- a/renv.lock
+++ b/renv.lock
@@ -1,6 +1,6 @@
 {
   "R": {
-    "Version": "4.4.3",
+    "Version": "4.5.1",
     "Repositories": [
       {
         "Name": "CRAN",
@@ -63,14 +63,14 @@
     },
     "S7": {
       "Package": "S7",
-      "Version": "0.2.0",
+      "Version": "0.2.1",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "R",
         "utils"
       ],
-      "Hash": "5deb66b3ae702137e1f4162c11861e76"
+      "Hash": "9da85950949574264f92f91f0e23de26"
     },
     "askpass": {
       "Package": "askpass",
@@ -201,13 +201,13 @@
     },
     "curl": {
       "Package": "curl",
-      "Version": "6.2.2",
+      "Version": "7.0.0",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "R"
       ],
-      "Hash": "e4f9e10b18f453a1b7eaf38247dad4fe"
+      "Hash": "aa27e963d3deccf4bade44d06b976977"
     },
     "desc": {
       "Package": "desc",
@@ -293,7 +293,7 @@
     },
     "ellmer": {
       "Package": "ellmer",
-      "Version": "0.2.0",
+      "Version": "0.4.0",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -308,19 +308,21 @@
         "later",
         "lifecycle",
         "promises",
-        "rlang"
+        "rlang",
+        "tibble",
+        "vctrs"
       ],
-      "Hash": "08f7504cda76185e0f689b19357706e0"
+      "Hash": "c251e14722bdfbe83b1b5c442d835064"
     },
     "evaluate": {
       "Package": "evaluate",
-      "Version": "1.0.1",
+      "Version": "1.0.5",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "R"
       ],
-      "Hash": "3fd29944b231036ad67c3edb32e02201"
+      "Hash": "94cf2c54237f6841cee68e3ba4ab5a14"
     },
     "fansi": {
       "Package": "fansi",
@@ -355,14 +357,14 @@
     },
     "fs": {
       "Package": "fs",
-      "Version": "1.6.5",
+      "Version": "1.6.6",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "R",
         "methods"
       ],
-      "Hash": "7f48af39fa27711ea5fbd183b399920d"
+      "Hash": "7eb1e342eee7e0a7449c49cdaa526d39"
     },
     "generics": {
       "Package": "generics",
@@ -430,7 +432,7 @@
     },
     "httr2": {
       "Package": "httr2",
-      "Version": "1.1.2",
+      "Version": "1.2.1",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -447,7 +449,7 @@
         "vctrs",
         "withr"
       ],
-      "Hash": "ade531519694081d91036b509eb30594"
+      "Hash": "6e29f1ed132b927f7d52e9fd8869f0ea"
     },
     "jquerylib": {
       "Package": "jquerylib",
@@ -461,17 +463,17 @@
     },
     "jsonlite": {
       "Package": "jsonlite",
-      "Version": "1.8.9",
+      "Version": "2.0.0",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "methods"
       ],
-      "Hash": "4e993b65c2c3ffbffce7bb3e2c6f832b"
+      "Hash": "b0776f526d36d8bd4a3344a88fe165c4"
     },
     "knitr": {
       "Package": "knitr",
-      "Version": "1.49",
+      "Version": "1.50",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -483,7 +485,7 @@
         "xfun",
         "yaml"
       ],
-      "Hash": "9fcb189926d93c636dea94fbe4f44480"
+      "Hash": "5a07d8ec459d7b80bd4acca5f4a6e062"
     },
     "later": {
       "Package": "later",
@@ -606,7 +608,7 @@
     },
     "pkgbuild": {
       "Package": "pkgbuild",
-      "Version": "1.4.5",
+      "Version": "1.4.8",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -617,7 +619,7 @@
         "desc",
         "processx"
       ],
-      "Hash": "30eaaab94db72652e72e3475c1b55278"
+      "Hash": "fc9fc4162e79a94f760aac8d328ee6c9"
     },
     "pkgconfig": {
       "Package": "pkgconfig",
@@ -631,7 +633,7 @@
     },
     "pkgdown": {
       "Package": "pkgdown",
-      "Version": "2.1.1",
+      "Version": "2.2.0",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -640,12 +642,12 @@
         "callr",
         "cli",
         "desc",
-        "digest",
         "downlit",
         "fontawesome",
         "fs",
         "httr2",
         "jsonlite",
+        "lifecycle",
         "openssl",
         "purrr",
         "ragg",
@@ -657,13 +659,13 @@
         "xml2",
         "yaml"
       ],
-      "Hash": "df2912d5873422b55a13002510f02c9f"
+      "Hash": "bc6b2a21988dba71f128f238b034294b"
     },
     "pkgload": {
       "Package": "pkgload",
-      "Version": "1.4.0",
+      "Version": "1.4.1",
       "Source": "Repository",
-      "Repository": "CRAN",
+      "Repository": "RSPM",
       "Requirements": [
         "R",
         "cli",
@@ -676,10 +678,9 @@
         "processx",
         "rlang",
         "rprojroot",
-        "utils",
-        "withr"
+        "utils"
       ],
-      "Hash": "2ec30ffbeec83da57655b850cf2d3e0e"
+      "Hash": "6f2060ae5ad112cc61df8876f93993de"
     },
     "praise": {
       "Package": "praise",
@@ -690,7 +691,7 @@
     },
     "processx": {
       "Package": "processx",
-      "Version": "3.8.4",
+      "Version": "3.8.6",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -699,7 +700,7 @@
         "ps",
         "utils"
       ],
-      "Hash": "0c90a7d71988856bad2a2a45dd871bb9"
+      "Hash": "720161b280b0a35f4d1490ead2fe81d0"
     },
     "promises": {
       "Package": "promises",
@@ -719,18 +720,18 @@
     },
     "ps": {
       "Package": "ps",
-      "Version": "1.8.1",
+      "Version": "1.9.1",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "R",
         "utils"
       ],
-      "Hash": "b4404b1de13758dea1c0484ad0d48563"
+      "Hash": "093688087b0bacce6ba2f661f36328e2"
     },
     "purrr": {
       "Package": "purrr",
-      "Version": "1.0.4",
+      "Version": "1.2.0",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -741,18 +742,18 @@
         "rlang",
         "vctrs"
       ],
-      "Hash": "cc8b5d43f90551fa6df0a6be5d640a4f"
+      "Hash": "5150f0e38b8150315ac853acade2740e"
     },
     "ragg": {
       "Package": "ragg",
-      "Version": "1.3.3",
+      "Version": "1.5.0",
       "Source": "Repository",
-      "Repository": "CRAN",
+      "Repository": "RSPM",
       "Requirements": [
         "systemfonts",
         "textshaping"
       ],
-      "Hash": "0595fe5e47357111f29ad19101c7d271"
+      "Hash": "cdb40b21711a8870f305b24226698f9f"
     },
     "rappdirs": {
       "Package": "rappdirs",
@@ -787,7 +788,7 @@
     },
     "rmarkdown": {
       "Package": "rmarkdown",
-      "Version": "2.29",
+      "Version": "2.30",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -806,17 +807,17 @@
         "xfun",
         "yaml"
       ],
-      "Hash": "df99277f63d01c34e95e3d2f06a79736"
+      "Hash": "efe19db0fde0fff13cea7eec6f695021"
     },
     "rprojroot": {
       "Package": "rprojroot",
-      "Version": "2.0.4",
+      "Version": "2.1.1",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "R"
       ],
-      "Hash": "4c8415e0ec1e29f3f4f6fc108bef0144"
+      "Hash": "b2453de2d29aa646afe4781defdc7903"
     },
     "rsconnect": {
       "Package": "rsconnect",
@@ -864,7 +865,7 @@
     },
     "shiny": {
       "Package": "shiny",
-      "Version": "1.10.0",
+      "Version": "1.11.1",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -872,8 +873,8 @@
         "R6",
         "bslib",
         "cachem",
+        "cli",
         "commonmark",
-        "crayon",
         "fastmap",
         "fontawesome",
         "glue",
@@ -893,7 +894,7 @@
         "withr",
         "xtable"
       ],
-      "Hash": "4b4477baa9a939c5577e5ddb4bf01f28"
+      "Hash": "1c1a2437351984ff592639ae28cda09e"
     },
     "shinychat": {
       "Package": "shinychat",
@@ -971,7 +972,7 @@
     },
     "testthat": {
       "Package": "testthat",
-      "Version": "3.2.1.1",
+      "Version": "3.3.0",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -981,7 +982,6 @@
         "callr",
         "cli",
         "desc",
-        "digest",
         "evaluate",
         "jsonlite",
         "lifecycle",
@@ -996,7 +996,7 @@
         "waldo",
         "withr"
       ],
-      "Hash": "3f6e7e5e2220856ff865e4834766bf2b"
+      "Hash": "198814ba13914c64a7fcf1b1ce5004e4"
     },
     "textshaping": {
       "Package": "textshaping",
@@ -1093,7 +1093,7 @@
     },
     "waldo": {
       "Package": "waldo",
-      "Version": "0.6.1",
+      "Version": "0.6.2",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -1104,7 +1104,7 @@
         "methods",
         "rlang"
       ],
-      "Hash": "52f574062a7b66e56926988c3fbdb3b7"
+      "Hash": "b7b91294ee9418a54527a9a9d8677597"
     },
     "whisker": {
       "Package": "whisker",
@@ -1127,7 +1127,7 @@
     },
     "xfun": {
       "Package": "xfun",
-      "Version": "0.49",
+      "Version": "0.54",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
@@ -1136,7 +1136,7 @@
         "stats",
         "tools"
       ],
-      "Hash": "8687398773806cfff9401a2feca96298"
+      "Hash": "e80bda1cae1725a7b2bc5b846ba1fdfb"
     },
     "xml2": {
       "Package": "xml2",
diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R
index 6dd373b..229b0a3 100644
--- a/tests/testthat/setup.R
+++ b/tests/testthat/setup.R
@@ -54,7 +54,7 @@ chat_openai_mocked <- function(system_prompt = NULL,
     model = model,
     params = params,
     extra_args = api_args,
-    api_key = api_key,
+    credentials = function() api_key,
     provider_class = ellmer:::ProviderOpenAI
   )
 }
diff --git a/tests/testthat/test-process_repos.R b/tests/testthat/test-process_repos.R
index 33a8942..131bfeb 100644
--- a/tests/testthat/test-process_repos.R
+++ b/tests/testthat/test-process_repos.R
@@ -1,5 +1,5 @@
 test_that("process_repos() returns results with repo metadata", {
-
+  testthat::skip_on_cran()
   withr::local_envvar(GITAI_VERBOSE = FALSE)
 
   my_project <- initialize_project("gitai_test_project") |>
diff --git a/tests/testthat/test-set_llm.R b/tests/testthat/test-set_llm.R
index 1232882..0db96fe 100644
--- a/tests/testthat/test-set_llm.R
+++ b/tests/testthat/test-set_llm.R
@@ -7,6 +7,8 @@ test_that("setting LLM ", {
 })
 
 test_that("setting system prompt", {
+  skip_on_cran()
+  skip_if_not(interactive())
   my_project <- initialize_project("gitai_test_project")
   expect_error(
     my_project |> set_prompt(system_prompt = "You always return only 'Hi there!'")
@@ -19,7 +21,7 @@ test_that("setting system prompt", {
     my_project$llm$get_system_prompt(),
     "You always return only 'Hi there!'"
   )
-  expect_equal(
+  expect_equal_to_reference(
     my_project$llm$chat("Hi"),
     "Hi there!"
   )
@@ -37,7 +39,7 @@ test_that("setting LLM with default provider ", {
   expect_true("Chat" %in% class(my_project$llm))
   expect_in(
     "ellmer::ProviderOpenAI",
-    class(my_project$llm$.__enclos_env__$private$provider)
+    class(my_project$llm$get_provider())
   )
 })
 
@@ -60,7 +62,7 @@ test_that("setting arguments for selected provider ", {
   my_project <- my_project |>
     set_llm(provider = "openai", model = "model_mocked")
   expect_equal(
-    my_project$llm$.__enclos_env__$private$provider@model,
+    my_project$llm$get_model(),
     "model_mocked"
   )
 
@@ -68,17 +70,10 @@ test_that("setting arguments for selected provider ", {
   my_project <- my_project |>
     set_llm(provider = "openai", api_key = "api_key_mocked")
   expect_equal(
-    my_project$llm$.__enclos_env__$private$provider@api_key,
+    my_project$llm$get_provider()@credentials(),
     "api_key_mocked"
   )
 
-  # Chat-related, non-default argument (not included within `llm_default_args`) is properly set
-  my_project <- my_project |>
-    set_llm(provider = "openai", echo = "all")
-  expect_equal(
-    my_project$llm$.__enclos_env__$private$echo,
-    "all"
-  )
 })
 
 test_that("setting LLM without system prompt", {