diff --git a/.github/Makefile b/.github/Makefile
index c3333dde..2425b4a9 100644
--- a/.github/Makefile
+++ b/.github/Makefile
@@ -49,7 +49,6 @@ configure: n98-magerun2.phar
 	bin/magento config:set payment/adyen_abstract/payment_methods_active 1
 	./n98-magerun2.phar config:store:set --encrypt payment/adyen_abstract/notification_password '1234'  > /dev/null
 	./n98-magerun2.phar config:store:set --encrypt payment/adyen_abstract/api_key_test "${ADYEN_API_KEY}" > /dev/null
-#	bin/magento config:set dev/template/minify_html 0
 	echo "configuration step ended"
 
 # Clear cache
@@ -69,6 +68,10 @@ fs:
 production:
 	bin/magento deploy:mode:set production
 
+set_hyva_checkout:
+	mysql -umagento -pmagento magento -e "UPDATE m2_core_config_data SET value = '5' WHERE path = 'design/theme/theme_id' AND scope = 'default';"
+	mysql -umagento -pmagento magento -e "INSERT INTO m2_core_config_data (scope, scope_id, path, value) VALUES ('default', 0, 'hyva_themes_checkout/general/checkout', 'default');"
+
 MAGENTO_ROOT=/var/www/html
 GRAPHQL_XML=${MAGENTO_ROOT}/dev/tests/api-functional/phpunit_graphql.xml.dist
 GRAPHQL_PHP=/data/extensions/workdir/Test/phpunit_graphql.php
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 39c816df..7a758773 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -53,15 +53,13 @@ jobs:
       - name: Switch to production mode
         run: docker exec -u www-data magento2-hyva-container make production
 
-      - name: Set the theme value in Config table
-        run: |
-          docker exec -i mariadb mysql -umagento -pmagento magento -e "UPDATE m2_core_config_data SET value = '5' WHERE path = 'design/theme/theme_id' AND scope = 'default';"
-          docker exec -i mariadb mysql -umagento -pmagento magento -e "INSERT INTO m2_core_config_data (scope, scope_id, path, value) VALUES ('default', 0, 'hyva_themes_checkout/general/checkout', 'default');"
-          docker exec -u www-data magento2-hyva-container bin/magento cache:flush
+      - name: Set HYVA as theme and default checkout
+        run: docker exec -i mariadb mysql -umagento -pmagento magento -e make set_hyva_checkout
 
       - name: Check DB for enabled Checkout Module
         run: |
-          docker exec -i mariadb mysql -umagento -pmagento magento -e "SELECT * FROM m2_core_config_data;"
+          docker exec -u www-data magento2-hyva-container make flush
+          docker exec -u www-data magento2-hyva-container bin/magento setup:static-content:deploy -f
 
       - name: Run E2E tests
         run: |