diff --git a/.github/scripts/install_hyva.sh b/.github/scripts/install_hyva.sh
index 0eec4f2e..bf2e2912 100644
--- a/.github/scripts/install_hyva.sh
+++ b/.github/scripts/install_hyva.sh
@@ -20,7 +20,8 @@ echo "Installing Hyva compatibility module"
 # TODO: update the branch from develop to current branch
 echo "dev-${BRANCH_NAME}"
 composer require adyen/module-hyva-checkout:dev-${BRANCH_NAME}
-
+bin/magento config:set dev/template/minify_html 0
+bin/magento config:set hyva-default-theme/general/enable 1 --lock-config
 bin/magento module:enable --all
 bin/magento setup:upgrade
 bin/magento setup:di:compile
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 2380bc80..e3d49b8f 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -56,7 +56,7 @@ jobs:
 
       - name: Check enabled Magento theme
         run: |
-           docker exec -u www-data magento2-hyva-container bash -c "mysql -u magento -pmagento magento -e 'SELECT theme_id, theme_title, code FROM theme;'"
+           docker exec -u www-data magento2-hyva-container bash -c "cd /var/www/html && bin/magento config:show | grep theme_id"
 
       - name: Run E2E tests
         run: |