diff --git a/composer.json b/composer.json
index b27309080fcdd13d6a0cb5f27fa3d4ae2b1b7711..7ae27fdf415aa0524ce1d5bb59a8953ca098576c 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,8 @@
     "drupal/varbase_email": "6.x-dev",
     "drupal/vartheme": "6.x-dev",
     "drupal/vartheme_bs4": "6.x-dev",
-    "drupal/vartheme_admin": "8.7.x-dev"
+    "drupal/vartheme_admin": "6.x-dev",
+    "drupal/vartheme_claro": "8.1.x-dev"
   },
   "require-dev": {
     "drupal/core-dev": "^8.8.0",
diff --git a/config/install/system.theme.yml b/config/install/system.theme.yml
index 53e1230df6942a8446c26abec95f5622697c7aa9..61e2b30ecbe5454e0e08b797db3a13f2af2a0d23 100644
--- a/config/install/system.theme.yml
+++ b/config/install/system.theme.yml
@@ -1,2 +1,2 @@
-admin: vartheme_admin
+admin: vartheme_claro
 default: vartheme_bs4
diff --git a/drupal-org.make b/drupal-org.make
index ea6fa4753fcc7ecd013c4bc97bc0744f46395087..258856629a80c4afb762d6b96b320025f8b2c1ed 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -604,7 +604,10 @@ projects[vartheme_bs4][type] = theme
 projects[vartheme_bs4][version] = 6.x-dev
 
 projects[vartheme_admin][type] = theme
-projects[vartheme_admin][version] = 7.x-dev
+projects[vartheme_admin][version] = 6.x-dev
+
+projects[vartheme_claro][type] = theme
+projects[vartheme_claro][version] = 1.x-dev
 
 ;;;;;;;;;;;;;;;;;;;;;
 ;; Libraries
diff --git a/tests/features/varbase/step2-apply-tests/03-admin-management/03-00-pre-check-important-admin-development-pages.feature b/tests/features/varbase/step2-apply-tests/03-admin-management/03-00-pre-check-important-admin-development-pages.feature
index 8a9ef0227a93703b6d084f7a42cc0574d323fa5e..b6c832424a32c439e2caf02f3be2a41ebc809294 100644
--- a/tests/features/varbase/step2-apply-tests/03-admin-management/03-00-pre-check-important-admin-development-pages.feature
+++ b/tests/features/varbase/step2-apply-tests/03-admin-management/03-00-pre-check-important-admin-development-pages.feature
@@ -90,7 +90,7 @@ So that I can use them after the install or update.
       And I should see "Claro"
       And I should see "Bootstrap"
       And I should see "Bootstrap Barrio"
-      And I should see "Vartheme Admin"
+      And I should see "Vartheme Claro"
 
    @check @local @development @staging @production
    Scenario: Check active type of media types
diff --git a/varbase.info.yml b/varbase.info.yml
index 6c1231b807d14abddef184e35759aa6f567cb871..a82d45d88470f175bc9de376eb3c6775797b0e7e 100755
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -7,7 +7,7 @@ project: varbase
 distribution:
   name: Varbase
   install:
-    theme: vartheme_admin
+    theme: vartheme_claro
 version: 8.x-8.x-dev
 install:
   - system
@@ -24,7 +24,7 @@ themes:
   - bootstrap_barrio
   - vartheme_bs4
   - claro
-  - vartheme_admin
+  - vartheme_claro
 
 interface translation project: varbase
 interface translation server pattern: profiles/varbase/translations/%language.po