diff --git a/percona-server-8.4.yaml b/percona-server-8.4.yaml
index 9402f4e1694..d213a645a19 100644
--- a/percona-server-8.4.yaml
+++ b/percona-server-8.4.yaml
@@ -1,6 +1,6 @@
 package:
   name: percona-server-8.4
-  version: 8.4.0
+  version: 8.4.0.1
   epoch: 0
   description: "Percona Server for MySQL is a free, fully compatible, enhanced, and open source drop-in replacement for any MySQL database. It provides superior performance, scalability, and instrumentation."
   copyright:
@@ -62,7 +62,7 @@ pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/percona/percona-server
-      tag: Percona-Server-${{package.version}}-1
+      tag: Percona-Server-${{vars.mangled-package-version}}
       expected-commit: 238b3c022afec1fc0a2fbffda77cb35cc3697b26
       recurse-submodules: true
 
@@ -146,66 +146,29 @@ update:
 
 test:
   pipeline:
-    - runs: |
-        mysqld --initialize
-        comp_err --version
-        comp_err --help
-        ibd2sdi --version
-        ibd2sdi --help
-        innochecksum --version
-        innochecksum --help
-        my_print_defaults --version
-        my_print_defaults --help
-        myisamchk --version
-        myisamchk --help
-        myisampack --version
-        myisampack --help
-        mysql --version
-        mysql --help
-        mysql_client_test --help
-        mysql_config_editor --version
-        mysql_config_editor --help
-        mysql_migrate_keyring --version
-        mysql_migrate_keyring --help
-        mysql_secure_installation --help
-        mysql_ssl_rsa_setup --version
-        mysql_ssl_rsa_setup --help
-        mysql_upgrade --version
-        mysql_upgrade --help
-        mysqladmin --version
-        mysqlbinlog --version
-        mysqlbinlog --help
-        mysqlcheck --version
-        mysqlcheck --help
-        mysqld --version
-        mysqld --help
-        mysqld_multi --version
-        mysqld_multi --help
-        mysqld_safe --version
-        mysqldump --version
-        mysqldump --help
-        mysqldumpslow --version
-        mysqldumpslow --help
-        mysqlimport --version
-        mysqlimport --help
-        mysqlpump --version
-        mysqlpump --help
-        mysqlrouter --version
-        mysqlrouter --help
-        mysqlrouter_keyring --version
-        mysqlrouter_keyring --help
-        mysqlrouter_passwd --version
-        mysqlrouter_passwd --help
-        mysqlrouter_plugin_info --version
-        mysqlrouter_plugin_info --help
-        mysqlshow --version
-        mysqlshow --help
-        mysqlslap --version
-        mysqlslap --help
-        mysqltest --version
-        mysqltest --help
-        perror --version
-        perror --help
-        ps-admin --help
-        ps_mysqld_helper --version
-        ps_mysqld_helper --help
+    - name: Create mysql user and prepare environment
+      runs: |
+        # Create a non-root user for the MySQL test...
+        adduser -D -h /home/mysql mysql
+        chown -R mysql:mysql /var/lib/mysql /run/mysqld /var/tmp
+        mkdir -p /run/mysqld /var/lib/mysql /var/tmp
+        chown -R mysql:mysql /run/mysqld /var/lib/mysql /var/tmp
+    - name: Initialize MySQL data directory
+      runs: |
+        su mysql -c "mysqld --initialize-insecure --datadir=/var/lib/mysql" || exit 1
+    - name: Start MySQL server with no password validation
+      runs: |
+        su mysql -c "mysqld --datadir=/var/lib/mysql --socket=/run/mysqld/mysqld.sock --skip-grant-tables &"
+        sleep 10
+        su mysql -c "mysqladmin ping --socket=/run/mysqld/mysqld.sock" || exit 1
+    - name: Create test database
+      runs: |
+        echo "CREATE DATABASE test_db;" | su mysql -c "mysql --socket=/run/mysqld/mysqld.sock" || exit 1
+    - name: Run test query
+      runs: |
+        echo "CREATE TABLE test_db.test_table (id INT PRIMARY KEY, name VARCHAR(50));" | su mysql -c "mysql --socket=/run/mysqld/mysqld.sock" || exit 1
+        echo "INSERT INTO test_db.test_table (id, name) VALUES (1, 'Percona Test');" | su mysql -c "mysql --socket=/run/mysqld/mysqld.sock" || exit 1
+        echo "SELECT * FROM test_db.test_table;" | su mysql -c "mysql --socket=/run/mysqld/mysqld.sock" || exit 1
+    - name: Stop MySQL server
+      runs: |
+        su mysql -c "mysqladmin shutdown --socket=/run/mysqld/mysqld.sock" || exit 1