diff --git a/.github/workflows/test_branch.yml b/.github/workflows/test_branch.yml
index 8d322842..ffd82a8b 100644
--- a/.github/workflows/test_branch.yml
+++ b/.github/workflows/test_branch.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Integration test
         run: |
           git clone https://github.com/fluencelabs/aqua-playground.git
-          sbt "cli/run -i aqua-playground/aqua -o aqua-playground/src/compiled"
+          sbt "cli/run -i aqua-playground/aqua/examples -o aqua-playground/src/compiled/examples"
           cd aqua-playground
           npm i
-          npm run exec
+          npm run examples
diff --git a/cli/src/main/scala/aqua/AquaCli.scala b/cli/src/main/scala/aqua/AquaCli.scala
index 8a8020a8..03419d0c 100644
--- a/cli/src/main/scala/aqua/AquaCli.scala
+++ b/cli/src/main/scala/aqua/AquaCli.scala
@@ -71,7 +71,13 @@ object AquaCli extends IOApp with LogSupport {
       None
     )(
       main[IO],
-      args
+      // Weird ugly hack: in case version flag or help flag is present, ignore other options,
+      // be it correct or not
+      args match {
+        case _ if args.contains("-v") || args.contains("--version") => "-v" :: Nil
+        case _ if args.contains("-h") || args.contains("--help") => "-h" :: Nil
+        case _ => args
+      }
     )
   }
 }